diff --git a/CMakeModules/SimoxMacros.cmake b/CMakeModules/SimoxMacros.cmake index a4abbee7ac20ff5c11fde389471b2e5069134001..c5a1d42aab55f189f375e9839f435a3696b004a2 100644 --- a/CMakeModules/SimoxMacros.cmake +++ b/CMakeModules/SimoxMacros.cmake @@ -16,7 +16,8 @@ function(VirtualRobotQtApplication name srcs incs mocFiles uiFiles) ################################## EXECUTABLE ############################## ADD_EXECUTABLE(${name} ${srcs} ${incs} ${generatedUiFiles} ${generatedMocFiles}) target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - TARGET_LINK_LIBRARIES(${name} PUBLIC VirtualRobot) + FIND_PACKAGE(SoQt REQUIRED) + TARGET_LINK_LIBRARIES(${name} PUBLIC VirtualRobot SoQt::SoQt) endfunction() diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt index 8bc87cdfe869aa4affe9c41d81a4d906be785bea..04f11da66f22351d4b217b882b804233f2b31adc 100644 --- a/VirtualRobot/CMakeLists.txt +++ b/VirtualRobot/CMakeLists.txt @@ -64,12 +64,8 @@ if (Simox_USE_COIN_VISUALIZATION) if (Qt5_FOUND AND Coin_FOUND) #### SoQt # This will set SoQt_INCLUDE_DIRS and SoQt_LIBRARIES - FIND_PACKAGE(SoQt QUIET) - #if (SoQt_INCLUDE_DIRS AND NOT SoQt_FOUND) #fix missing variable if include dirs was found - # set(SoQt_FOUND TRUE) - # set(SoQt_FOUND TRUE PARENT_SCOPE) - #endif () - + FIND_PACKAGE(SoQt REQUIRED) + if (NOT SoQt_FOUND) MESSAGE (STATUS "Did not find SoQt. Disabling SoQt support.") else () @@ -79,8 +75,7 @@ if (Simox_USE_COIN_VISUALIZATION) set(Simox_VISUALIZATION TRUE CACHE BOOL "") set(Simox_BUILD_EXAMPLES ON CACHE BOOL "Build example applications") - target_include_directories(VirtualRobot PUBLIC ${SoQt_INCLUDE_DIRS}) - target_link_libraries(VirtualRobot PUBLIC ${SoQt_LIBRARY_PATH}) + target_link_libraries(VirtualRobot PUBLIC SoQt::SoQt) target_compile_definitions(VirtualRobot PUBLIC -DSoQt_DLL -DSIMOX_USE_SoQt) if (NOT UNIX)