haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert caf406943e and don't install the kicad2step lib 

This fixes https://gitlab.com/kicad/code/kicad/-/issues/9944 and reverts
caf406943e. 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 fb36e1b582)
This commit is contained in:
Ian McInerney 2021-12-30 15:18:30 +00:00 committed by Ian McInerney
parent d60e77176f
commit abaee94109
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/kicad2step/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set( KS2_LIB_FILES
# Break the library out for re-use by both kicad2step and any qa that needs it # 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 (?) # 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} ${KS2_LIB_FILES}
) )
@ -65,7 +65,7 @@ if( APPLE )
RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR} RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR}
) )
else() else()
install( TARGETS kicad2step_bin kicad2step_lib install( TARGETS kicad2step_bin
RUNTIME DESTINATION ${KICAD_BIN} RUNTIME DESTINATION ${KICAD_BIN}
ARCHIVE DESTINATION ${KICAD_LIB} ARCHIVE DESTINATION ${KICAD_LIB}
COMPONENT binary ) COMPONENT binary )