diff --git a/CMakeLists.txt b/CMakeLists.txt index f6cf61c0fd9e75325fcf14f910470cba5638ac2a..679b50b28b835fa8b2fda1e2bb780d98524152b3 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 0f7c71413f229c7d98e79db6208403304cbe19a6..d5798c37dfe9fbfae5841534f464792685b84279 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 f8d06f5db66d331bc841d48177f05760441737cd..b4fa345c9a91b6b75ef76200a5d179094beb3b0d 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})