Skip to content
Snippets Groups Projects
Commit b8b525bd authored by vahrenkamp's avatar vahrenkamp
Browse files

Minor install bugfix. May have caused errors on first install.

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@255 042f3d55-54a8-47e9-b7fb-15903f145c44
parent 827ecc28
No related branches found
No related tags found
No related merge requests found
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment