diff --git a/CMakeLists.txt b/CMakeLists.txt index d80af90..bae5d72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,65 +1,65 @@ project(liboncilla-webots C CXX) cmake_minimum_required(VERSION 2.8) find_package(BiorobCMakeUtils 0.3.4 REQUIRED) include_all_biorob_cmake_utils() -make_std_versionning(MAJOR 0 MINOR 2 PATCH 0~rc1) +make_std_versionning(MAJOR 0 MINOR 2 PATCH 0~rc2) find_package(PkgConfig REQUIRED) ################################################################################ # Boost, C++11 and CLANG check ################################################################################ find_package(Boost REQUIRED) if("${CMAKE_CXX_COMPILER}" MATCHES ".*clang.*") if( "${Boost_VERSION}" VERSION_LESS "104801") message(FATAL_ERROR "There is some incompatibility with boost <= 1.48.0 (here ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}) and C++11 features. Since your compiler (Clang) fully support C++11, you should use a more recent version of Boost to compile this library. C++11 is needed by NemoMath dependency.") endif( "${Boost_VERSION}" VERSION_LESS "104801") endif("${CMAKE_CXX_COMPILER}" MATCHES ".*clang.*") pkg_check_modules(LIBWEBOTS REQUIRED libwebots-communication-0.3>=0.3.1~rc3 libwebots-messages-0.3>=0.3.1~rc3 ) pkg_check_modules(LIBONCILLA REQUIRED liboncilla-0) find_package(Webots 6.4.1 REQUIRED) add_definitions(${LIBONCILLA_CFLAGS_OTHER}) include_directories(${LIBWEBOTS_INCLUDE_DIRS} ${LIBONCILLA_INCLUDE_DIRS} ${WEBOTS_INCLUDE_DIRS}) set(LIBONCILLA_WEBOTS_INCLUDE_DIRS include/liboncilla-webots-${VERSION_API} ) set(PKG_CONFIG_FILE ${PROJECT_BINARY_DIR}/liboncilla-webots-${VERSION_API}.pc) configure_file(liboncilla-webots.pc.in ${PKG_CONFIG_FILE} @ONLY) install(FILES ${PKG_CONFIG_FILE} DESTINATION lib/pkgconfig) include(CheckCXXCompilerFlag) add_subdirectory(src) ################################################################################ # webots world file generation ################################################################################ set(WORLD_FILES_DIR ${PROJECT_SOURCE_DIR}/webots-data/worlds) set(WORLD_FILES_BUILD_DIR ${PROJECT_BINARY_DIR}/webots-data/worlds) execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable example_list liboncilla-0 OUTPUT_VARIABLE LIBONCILLA_EXAMPLE_LIST OUTPUT_STRIP_TRAILING_WHITESPACE) foreach(e ${LIBONCILLA_EXAMPLE_LIST}) set(CONTROLLER ${e}) configure_file(${WORLD_FILES_DIR}/Oncilla.wbt.in ${WORLD_FILES_BUILD_DIR}/Oncilla-${e}.wbt @ONLY) endforeach(e ${LIBONCILLA_EXAMPLE_LIST})