+13
-8
@@ -222,10 +222,15 @@ target_include_directories(${LIB_UTILITY_PROJECT_NAME} SYSTEM
|
||||
PUBLIC ${Boost_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
if(UNIX)
|
||||
target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network)
|
||||
else()
|
||||
target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network Qt5::WinExtras)
|
||||
target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network)
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${CMAKE_DL_LIBS} rt ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(${LIB_UTILITY_PROJECT_NAME} Qt5::WinExtras)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -438,10 +443,10 @@ add_custom_target(
|
||||
|
||||
add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h)
|
||||
|
||||
if(UNIX)
|
||||
target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg)
|
||||
else()
|
||||
target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg Qt5::WinExtras)
|
||||
target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg)
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::WinExtras)
|
||||
endif()
|
||||
|
||||
# command for versioning script
|
||||
|
||||
Reference in New Issue
Block a user