From e488de0ec0fc76548b195ce1bdf366e5ff297103 Mon Sep 17 00:00:00 2001
From: vahrenkamp <vahrenkamp@042f3d55-54a8-47e9-b7fb-15903f145c44>
Date: Wed, 16 May 2012 21:54:01 +0000
Subject: [PATCH] minor build update. Switching from find_file to find_path in
order to server a consistent variable use.
git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@249 042f3d55-54a8-47e9-b7fb-15903f145c44
---
CMakeModules/FindSimox.cmake | 11 +++--------
VirtualRobot/CMakeModules/FindVirtualRobot.cmake | 13 +++++++------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/CMakeModules/FindSimox.cmake b/CMakeModules/FindSimox.cmake
index ffee9e831..23e267337 100644
--- a/CMakeModules/FindSimox.cmake
+++ b/CMakeModules/FindSimox.cmake
@@ -17,7 +17,6 @@
# A CMakeLists.txt file for setting up a simox related project could look like this:
#
## PROJECT ( myDemo )
-## SET(Simox_DIR $ENV{Simox_DIR} CACHE STRING "Choose the path to Simox (install or build).")
## FIND_PACKAGE(Simox REQUIRED)
## IF(SIMOX_USE_COIN_VISUALIZATION)
## FILE(GLOB SRCS ${PROJECT_SOURCE_DIR}/myDemo.cpp ${PROJECT_SOURCE_DIR}/myWindow.cpp)
@@ -27,18 +26,14 @@
## SimoxQtApplication(${PROJECT_NAME} "${SRCS}" "${INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
## ENDIF()
-
-MESSAGE ("START1")
-
#### CMAKE CONFIG
-find_file( Simox_CMAKE_CONFIG SimoxConfig.cmake
- "${Custom_Simox_DIR}/share/Simox/cmake"
- "${Simox_DIR}/share/Simox/cmake"
- "$ENV{Simox_DIR}/share/Simox/cmake"
+
+find_path( Simox_DIR SimoxConfig.cmake
"${Custom_Simox_DIR}"
"${Simox_DIR}"
"$ENV{Simox_DIR}")
+SET (Simox_CMAKE_CONFIG ${Simox_DIR}/SimoxConfig.cmake)
MESSAGE(STATUS " * Including ${Simox_CMAKE_CONFIG}")
include (${Simox_CMAKE_CONFIG})
diff --git a/VirtualRobot/CMakeModules/FindVirtualRobot.cmake b/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
index 0c7305568..6a97b786c 100644
--- a/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
+++ b/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
@@ -31,12 +31,13 @@
#### CMAKE CONFIG
-find_file( Simox_VR_CMAKE_CONFIG VirtualRobotConfig.cmake
- "${Custom_Simox_VR_DIR}/share/VirtualRobot/cmake"
- "${VirtualRobot_DIR}/share/VirtualRobot/cmake"
- "$ENV{VirtualRobot_DIR}/share/VirtualRobot/cmake"
- "${Simox_DIR}/share/VirtualRobot/cmake"
- "$ENV{Simox_DIR}/share/VirtualRobot/cmake")
+find_path( VirtualRobot_DIR VirtualRobotConfig.cmake
+ "${Custom_Simox_VR_DIR}"
+ "${VirtualRobot_DIR}"
+ "$ENV{VirtualRobot_DIR}")
+
+
+SET (Simox_VR_CMAKE_CONFIG ${VirtualRobot_DIR}/VirtualRobotConfig.cmake)
MESSAGE(STATUS " Including ${Simox_VR_CMAKE_CONFIG}")
include (${Simox_VR_CMAKE_CONFIG})
--
GitLab