Skip to content
Snippets Groups Projects
Commit e43d244b authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Add and use Simox_BOOST_VERSION

parent d294c3a5
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.10)
PROJECT(Simox LANGUAGES CXX VERSION 2.3.74.0)
MESSAGE (STATUS "** Simox version: ${Simox_VERSION}")
INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake)
SET(Simox_BOOST_VERSION 1.65.1)
#######################################################################################
#global config
# Set up build type
......@@ -41,7 +42,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
FIND_PACKAGE (Eigen3 REQUIRED)
FIND_PACKAGE(Boost COMPONENTS
FIND_PACKAGE(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS
filesystem
system
program_options
......
......@@ -56,10 +56,11 @@ SET(Simox_USE_NLOPT "@Simox_USE_NLOPT@")
SET(SimDynamics_USE_BULLET "@SimDynamics_USE_BULLET@")
SET(SimDynamics_USE_BULLET_DOUBLE_PRECISION "@SimDynamics_USE_BULLET_DOUBLE_PRECISION@")
SET(Simox_BOOST_VERSION "@Simox_BOOST_VERSION@")
FIND_PACKAGE(Eigen3 QUIET)
FIND_PACKAGE(Qt5 5.5.0 COMPONENTS OpenGL Core Gui Widgets QUIET)
FIND_PACKAGE(Boost COMPONENTS
FIND_PACKAGE(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS
filesystem
system
program_options
......
......@@ -2,7 +2,7 @@ PROJECT ( Saba )
MESSAGE (STATUS "***** CONFIGURING Simox project Saba *****")
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
find_package(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS unit_test_framework REQUIRED)
########################### TESTING #####################################
......
project(MujocoMeshReader)
find_package(Boost COMPONENTS system filesystem REQUIRED)
find_package(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS system filesystem REQUIRED)
if (Boost_FOUND)
......
project(Simox2Mjcf)
#find_package(TinyXML2 7.0.0)
find_package(Boost COMPONENTS system filesystem REQUIRED)
find_package(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS system filesystem REQUIRED)
#if (TINYXML2_FOUND AND Boost_FOUND)
if (Boost_FOUND)
#include_directories(${TINYXML2_INCLUDE_DIR})
set(SOURCES
main.cpp
)
set(HEADERS
)
set(SOURCES main.cpp)
set(HEADERS)
set(LIBS
VirtualRobot
# ${TINYXML2_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARIES}
${BOOST_SYSTEM_LIBRARIES}
)
add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS})
set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
......@@ -33,11 +22,9 @@ if (Boost_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
#######################################################################################
############################ Setup for installation ###################################
#######################################################################################
install(TARGETS ${PROJECT_NAME}
# IMPORTANT: Add the library to the "export-set"
EXPORT SimoxTargets
......@@ -46,5 +33,4 @@ if (Boost_FOUND)
message( STATUS " ** Simox application ${PROJECT_NAME} will be placed into " ${Simox_BIN_DIR})
message( STATUS " ** Simox application ${PROJECT_NAME} will be installed into " bin)
endif()
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