From abaee9410910698f882bfd9b8f9ec1f717de34d2 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 30 Dec 2021 15:18:30 +0000 Subject: [PATCH] Revert caf406943e3e3c2a6dd8be40aa98ec8e2ccd6b1c and don't install the kicad2step lib This fixes https://gitlab.com/kicad/code/kicad/-/issues/9944 and reverts caf406943e3e3c2a6dd8be40aa98ec8e2ccd6b1c. The original fix caused issues with some CMake versions because it tried to give library dependencies to an object library, which can't have any library dependencies. Instead, we need it as a static library, and since there is no need to actually have it as an end-user library, it shouldn't be in the install command. Fixes https://gitlab.com/kicad/code/kicad/-/issues/9944 (Cherry-picked from commit fb36e1b58270555e313182c81b71279d8e7b4a75) --- utils/kicad2step/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kicad2step/CMakeLists.txt b/utils/kicad2step/CMakeLists.txt index a63cd00418..2bc9c94e29 100644 --- a/utils/kicad2step/CMakeLists.txt +++ b/utils/kicad2step/CMakeLists.txt @@ -19,7 +19,7 @@ set( KS2_LIB_FILES # Break the library out for re-use by both kicad2step and any qa that needs it # In future, this could move for re-use by other programs needing s-expr support (?) -add_library( kicad2step_lib OBJECT +add_library( kicad2step_lib STATIC ${KS2_LIB_FILES} ) @@ -65,7 +65,7 @@ if( APPLE ) RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR} ) else() - install( TARGETS kicad2step_bin kicad2step_lib + install( TARGETS kicad2step_bin RUNTIME DESTINATION ${KICAD_BIN} ARCHIVE DESTINATION ${KICAD_LIB} COMPONENT binary )