From b7b560813d85bf1cf1d1d82470e5bc4f1bc76bad Mon Sep 17 00:00:00 2001
From: vahrenkamp <vahrenkamp@042f3d55-54a8-47e9-b7fb-15903f145c44>
Date: Sat, 18 Jan 2014 19:11:15 +0000
Subject: [PATCH] SimDynamics cmake fixes
git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@489 042f3d55-54a8-47e9-b7fb-15903f145c44
---
CMakeLists.txt | 12 ++++++++++++
SimDynamics/CMakeLists.txt | 4 ++--
config.cmake | 6 +-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6cf61c0f..679b50b28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,19 @@ if (Simox_BUILD_SimDynamics)
add_subdirectory(SimDynamics)
list(APPEND SIMOX_EXPORT_TARGET_LIST SimDynamics)
list (APPEND Simox_LIBRARIES SimDynamics)
+ list (APPEND Simox_EXTERNAL_LIBRARIES ${Simox_SimDynamics_EXTERNAL_LIBRARIES})
+ list (APPEND Simox_EXTERNAL_INCLUDE_DIRS ${Simox_SimDynamics_INCLUDE_DIRS})
+
+
+
endif()
+
+ MESSAGE(STATUS "** Simox_EXTERNAL_INCLUDE_DIRS:${Simox_EXTERNAL_INCLUDE_DIRS}")
+ MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARY_DIRS:${Simox_EXTERNAL_LIBRARY_DIRS}")
+ MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARIES:${Simox_EXTERNAL_LIBRARIES}")
+ MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARY_FLAGS:${Simox_EXTERNAL_LIBRARY_FLAGS}")
+ MESSAGE(STATUS "** Simox_EXTERNAL_CMAKE_INCLUDE:${Simox_EXTERNAL_CMAKE_INCLUDE}")
+
add_subdirectory(doc)
diff --git a/SimDynamics/CMakeLists.txt b/SimDynamics/CMakeLists.txt
index 0f7c71413..d5798c37d 100644
--- a/SimDynamics/CMakeLists.txt
+++ b/SimDynamics/CMakeLists.txt
@@ -179,8 +179,8 @@ if (SimDynamics_DYNAMICSENGINE)
endif ()
# this var is considered for generating Simox_INCLUDE_DIRS_
- #SET(SimDynamics_INCLUDE_DIRS "${SimDynamics_SimoxDir}" "${SimDynamics_DIR}" PARENT_SCOPE)
- #SET(SimDynamics_EXTERNAL_LIBRARIES "${SimDynamics_PHYSICS_LIBRARIES}" PARENT_SCOPE)
+ SET(Simox_SimDynamics_INCLUDE_DIRS "${SIMDYNAMICS_INCLUDE_DIRS}" PARENT_SCOPE)
+ SET(Simox_SimDynamics_EXTERNAL_LIBRARIES "${SimDynamics_PHYSICS_LIBRARIES}" PARENT_SCOPE)
#INCLUDE_DIRECTORIES(${SimDynamics_SimoxDir})
#INCLUDE_DIRECTORIES(${SimDynamics_DIR})
diff --git a/config.cmake b/config.cmake
index f8d06f5db..b4fa345c9 100644
--- a/config.cmake
+++ b/config.cmake
@@ -314,11 +314,7 @@ IF (NOT Simox_CONFIGURED)
SET (Simox_EXTERNAL_INCLUDE_DIRS ${Simox_EXTERNAL_INCLUDE_DIRS} ${Simox_VISUALIZATION_INCLUDE_PATHS})
SET (Simox_EXTERNAL_LIBRARIES ${Simox_EXTERNAL_LIBRARIES} ${Simox_VISUALIZATION_LIBS})
SET (Simox_EXTERNAL_LIBRARY_FLAGS "${Simox_EXTERNAL_LIBRARY_FLAGS} ${Simox_VISUALIZATION_COMPILE_FLAGS}")
- MESSAGE(STATUS "** Simox_EXTERNAL_INCLUDE_DIRS:${Simox_EXTERNAL_INCLUDE_DIRS}")
- MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARY_DIRS:${Simox_EXTERNAL_LIBRARY_DIRS}")
- MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARIES:${Simox_EXTERNAL_LIBRARIES}")
- MESSAGE(STATUS "** Simox_EXTERNAL_LIBRARY_FLAGS:${Simox_EXTERNAL_LIBRARY_FLAGS}")
- MESSAGE(STATUS "** Simox_EXTERNAL_CMAKE_INCLUDE:${Simox_EXTERNAL_CMAKE_INCLUDE}")
+
## for historical reasons: set VirtualRobot flags to Simox flags
SET (VirtualRobot_VISUALIZATION ${Simox_VISUALIZATION})
--
GitLab