Update the target_link_library usage for gerbview_kiface
This commit is contained in:
parent
b3f55e7f8b
commit
99fae6a327
|
@ -134,6 +134,7 @@ add_library( gerbview_kiface_objects OBJECT
|
||||||
${WIDGET_SRCS}
|
${WIDGET_SRCS}
|
||||||
${GERBVIEW_EXTRA_SRCS}
|
${GERBVIEW_EXTRA_SRCS}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries( gerbview_kiface_objects
|
target_link_libraries( gerbview_kiface_objects
|
||||||
PUBLIC
|
PUBLIC
|
||||||
common
|
common
|
||||||
|
@ -141,18 +142,23 @@ target_link_libraries( gerbview_kiface_objects
|
||||||
)
|
)
|
||||||
|
|
||||||
# the main gerbview program, in DSO form.
|
# the main gerbview program, in DSO form.
|
||||||
add_library( gerbview_kiface MODULE $<TARGET_OBJECTS:gerbview_kiface_objects> )
|
add_library( gerbview_kiface MODULE )
|
||||||
|
|
||||||
set_target_properties( gerbview_kiface PROPERTIES
|
set_target_properties( gerbview_kiface PROPERTIES
|
||||||
OUTPUT_NAME gerbview
|
OUTPUT_NAME gerbview
|
||||||
PREFIX ${KIFACE_PREFIX}
|
PREFIX ${KIFACE_PREFIX}
|
||||||
SUFFIX ${KIFACE_SUFFIX}
|
SUFFIX ${KIFACE_SUFFIX}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries( gerbview_kiface
|
target_link_libraries( gerbview_kiface
|
||||||
nlohmann_json
|
PRIVATE
|
||||||
gal
|
nlohmann_json
|
||||||
common
|
gal
|
||||||
${wxWidgets_LIBRARIES}
|
common
|
||||||
|
gerbview_kiface_objects
|
||||||
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_source_files_properties( gerbview.cpp PROPERTIES
|
set_source_files_properties( gerbview.cpp PROPERTIES
|
||||||
# The KIFACE is in gerbview.cpp, export it:
|
# The KIFACE is in gerbview.cpp, export it:
|
||||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||||
|
|
Loading…
Reference in New Issue