From 1048ddf24a46c4794bca373549adb571b418ab98 Mon Sep 17 00:00:00 2001 From: vahrenkamp <vahrenkamp@042f3d55-54a8-47e9-b7fb-15903f145c44> Date: Mon, 27 Oct 2014 17:18:03 +0000 Subject: [PATCH] worked on bullet double precision cmake export git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@719 042f3d55-54a8-47e9-b7fb-15903f145c44 --- CMakeLists.txt | 6 +++++- SimDynamics/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03dfc8699..b672c6c29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,11 @@ if (Simox_BUILD_SimDynamics) list (APPEND Simox_EXTERNAL_LIBRARIES ${Simox_SimDynamics_EXTERNAL_LIBRARIES}) list (APPEND Simox_EXTERNAL_INCLUDE_DIRS ${Simox_SimDynamics_INCLUDE_DIRS}) - list (APPEND Simox_EXTERNAL_LIBRARY_FLAGS ${Simox_SimDynamics_COMPILE_FLAGS}) + #MESSAGE ("Simox_EXTERNAL_LIBRARY_FLAGS::: ${Simox_EXTERNAL_LIBRARY_FLAGS} !!!!!!!!!!!!!!!!") + #MESSAGE ("Simox_SimDynamics_COMPILE_FLAGS::: ${Simox_SimDynamics_COMPILE_FLAGS} !!!!!!!!!!!!!!!!") + #list (APPEND Simox_EXTERNAL_LIBRARY_FLAGS ${Simox_SimDynamics_COMPILE_FLAGS}) + set (Simox_EXTERNAL_LIBRARY_FLAGS "${Simox_EXTERNAL_LIBRARY_FLAGS} ${Simox_SimDynamics_COMPILE_FLAGS}") + #MESSAGE ("Simox_EXTERNAL_LIBRARY_FLAGS::: ${Simox_EXTERNAL_LIBRARY_FLAGS} !!!!!!!!!!!!!!!!") diff --git a/SimDynamics/CMakeLists.txt b/SimDynamics/CMakeLists.txt index a5d54a5b0..59e48a2ae 100644 --- a/SimDynamics/CMakeLists.txt +++ b/SimDynamics/CMakeLists.txt @@ -47,7 +47,7 @@ if (SimDynamics_USE_BULLET) endif() IF( SimDynamics_USE_BULLET_DOUBLE_PRECISION ) ADD_DEFINITIONS( -DBT_USE_DOUBLE_PRECISION) - SET(SIMDYNAMICS_COMPILE_FLAGS "${SIMDYNAMICS_COMPILE_FLAGS}" "-DBT_USE_DOUBLE_PRECISION") + LIST(APPEND SIMDYNAMICS_COMPILE_FLAGS "-DBT_USE_DOUBLE_PRECISION") ENDIF( SimDynamics_USE_BULLET_DOUBLE_PRECISION ) #MESSAGE(STATUS "BULLET_LIBRARIES:${BULLET_LIBRARIES}") SET (SimDynamics_PHYSICS_LIBRARIES "${BULLET_LIBRARIES}") -- GitLab