From f14ef477cc8c725aa24622cb3da479d80aad6576 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 12 Mar 2022 11:04:57 +0100 Subject: [PATCH] Fix a incorrect filename in a copy command (MSW specific). Also fix a regression and respect the KICAD_BUILD_QA_TESTS build option. --- CMakeLists.txt | 5 ++++- pcbnew/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef63d26cf6..9d30193c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1028,7 +1028,10 @@ add_subdirectory( cvpcb ) # must be after pcbnew add_subdirectory( kicad ) # should follow pcbnew, eeschema add_subdirectory( tools ) add_subdirectory( utils ) -add_subdirectory( qa ) + +if( KICAD_BUILD_QA_TESTS ) + add_subdirectory( qa ) +endif() # Demos if( KICAD_INSTALL_DEMOS ) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 2b705ea1c2..0077e0317c 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -845,7 +845,7 @@ else() # For phase 1, copy _pcbnew.kiface to the python module. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} DEPENDS pcbnew_kiface - COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT} + COMMAND ${CMAKE_COMMAND} -E copy _pcbnew${KIFACE_SUFFIX} _pcbnew.${PYMOD_EXT} COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use." ) add_custom_target(