diff --git a/CMakeLists.txt b/CMakeLists.txt index ff3536e086353eacfa50ff0f8c1ec3df07122e52..c129867b028bc0494bb1439fe950fcdb5338098a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ EXPORT(PACKAGE Simox) #message(STATUS "VirtualRobot_external_INCLUDE_DIRS: ${VirtualRobot_external_INCLUDE_DIRS}") # import Virtual-Robot configs (build) -SET (VIRTUAL_ROBOT_CONFIG_INBUILD "${SIMOX_BUILD_DIRECTORY}/share/VirtualRobot/cmake/VirtualRobotConfig.cmake") +SET (VIRTUAL_ROBOT_CONFIG_INBUILD "${SIMOX_BUILD_DIRECTORY}/VirtualRobotConfig.cmake") SET (VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL "${SIMOX_BUILD_DIRECTORY}/InstallFiles/VirtualRobotConfig.cmake") #MESSAGE ("VIRTUAL_ROBOT_CONFIG_INBUILD = ${VIRTUAL_ROBOT_CONFIG_INBUILD}") #MESSAGE ("VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL = ${VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL}") @@ -89,8 +89,8 @@ configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/FindSimox.cmake" # do not include files from install tree here (the files are not installed yet. So include them manually from inbuild) SET (VIRTUAL_ROBOT_DISABLE_DEPENDENCIES_INCLUDE TRUE) include ("${VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL}") -include(${SIMOX_BUILD_DIRECTORY}/share/VirtualRobot/cmake/VirtualRobotExternalLibrarySetup.cmake) -include(${SIMOX_BUILD_DIRECTORY}/share/VirtualRobot/cmake/VirtualRobotMacros.cmake) +include(${PROJECT_SOURCE_DIR}/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake) +include(${PROJECT_SOURCE_DIR}/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake) SET(SIMOX_INCLUDE_DIRS "${VIRTUAL_ROBOT_INCLUDE_DIRS}" "${GRASP_STUDIO_INCLUDE_DIRS}" "${SABA_INCLUDE_DIRS}") SET(SIMOX_LIB_DIRS "${VIRTUAL_ROBOT_LIBRARY_DIRS}" "${GRASP_STUDIO_LIBRARY_DIRS}" "${SABA_LIBRARY_DIRS}")