Big overhaul and cmake files, moving code to c++17, europa and lsts should work, python to be ported

Author: Frederic Py

CMakeLists.txt

@@ -33,79 +33,38 @@
 # POSSIBILITY OF SUCH DAMAGE.                                         #
 #######################################################################
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/;${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
-########################################################################
-# remove annoying warning since cmake 3                                #
-########################################################################
-if(CMAKE_MAJOR_VERSION GREATER 2)
-  cmake_policy(SET CMP0042 NEW)
-endif()
-
-# Do the prep for OSX 10.11
-set(DEST_LIB ${CMAKE_INSTALL_PREFIX}/lib)
-
-if(APPLE)
-    set(CMAKE_MACOSX_RPATH ON) 
-    # use, i.e. don't skip the full RPATH for the build tree
-    SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-    # when building, don't use the install RPATH already
-    # (but later on when installing)
-    SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
-    SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-    # add the automatically determined parts of the RPATH
-    # which point to directories outside the build tree to the install RPATH
-    SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-    # the RPATH to be used when installing, but only if it's not a system directory
-    LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-    IF("${isSystemDir}" STREQUAL "-1")
-      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-    ENDIF("${isSystemDir}" STREQUAL "-1")
-endif()
-
-
-########################################################################
-# Project definitions                                                  #
-########################################################################
-project(trex)
-set(TREX_MAJOR 0)
-set(TREX_MINOR 6)
-set(TREX_PATCH 5)
-set(TREX_RC 0)
-
-# TREX script for CPack management
-include(trex_pack)
-
-include_directories(
-  ${PROJECT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  # Need this for config generated files
-  ${CMAKE_BINARY_DIR}/trex/utils
-  )
+project(trex VERSION 0.7.0)
 
 include(trex_requirements)
-include(trex_macros)
-
-set(TREX_SHARED share/trex)
-include_directories(${CMAKE_BINARY_DIR})
 
 ########################################################################
 # TREX sub directories                                                 #
 ########################################################################
-
 # core libraries 
 add_subdirectory(trex)
-trex_cfg(cfg ${TREX_SHARED})
 
 # include extra/plugins
 add_subdirectory(extra) 
 
+configure_file(scripts/trex_init.bash.in ${CMAKE_CURRENT_BINARY_DIR}/trex_init.bash @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/trex_init.bash DESTINATION shared/trex)
+
 ########################################################################
 # Finalize                                                             #
 ########################################################################
-include(trex_finalize)
-
+install(EXPORT trex NAMESPACE trex:: DESTINATION shared/trex/cmake/imports OPTIONAL)
+
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(cmake/trex-config.cmake.in
+"${CMAKE_CURRENT_BINARY_DIR}/trexConfig.cmake"
+INSTALL_DESTINATION shared/trex/cmake
+)
+write_basic_package_version_file(trexConfigVersion.cmake VERSION ${VERSION} COMPATIBILITY AnyNewerVersion)
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/trexConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/trexConfigVersion.cmake"
+    DESTINATION shared/trex/cmake
+)

cmake/trex-config.cmake.in

@@ -33,19 +33,9 @@
 # POSSIBILITY OF SUCH DAMAGE.                                         #
 #######################################################################
 # include directories used by trex libraries
-set(trex_INCLUDE_DIRS @TREX_INCS@ CACHE STRING "include paths for trex" FORCE)
-# flags required to use trex : mostly the ones related to c++11 support when enabled
-set(trex_CPPFLAGS @trex_FLAGS@ CACHE STRING "trex extra C++ flags" FORCE)
-
-set(trex_VERSION @VERSION@)
+@PACKAGE_INIT@
 
 get_filename_component(TREX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # Import trex libraries
-include(${TREX_CMAKE_DIR}/imports/trex-targets.cmake)
-# the set of core libraries targets
-set(trex_LIBRARIES @trex-core@ CACHE STRING "trex core libraries" FORCE)
-# the set of extra libraries (such as europa extensions, ros, ...)
-set(trex_extra_LIBRARIES @trex-extra@ CACHE STRING "trex extensions for plugins" FORCE)
+include(${TREX_CMAKE_DIR}/imports/trex.cmake)
 
-# Note the plugin are not included ... should work on that later
-set(trex_python_LIBRARIES @trex-python@ CACHE STRING "trex python modules" FORCE)

cmake/trex_requirements.cmake

@@ -41,193 +41,39 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINK_NO_AS_NEEDED "-Wl,--no-as-needed")
 endif()
 
-
-
 ########################################################################
 # System libraries                                                     #
 ########################################################################
 include(CheckLibraryExists)
 
-check_library_exists(dl dlopen "" LIB_DL)
-if(LIB_DL)
-  set(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES} dl)
-else(LIB_DL) 
+check_library_exists(dl dlopen "" HAVE_DL)
+if(NOT HAVE_DL)  
   message(FATAL_ERROR "TREX requires lib dl")  
-endif(LIB_DL)
-
-check_library_exists(pthread pthread_self "" LIB_PTHREAD)
-if(LIB_PTHREAD)
-  set(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES} pthread)
-endif(LIB_PTHREAD)
-
-check_library_exists(rt shm_unlink "" LIB_RT)
-if(LIB_RT)
-  set(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES} rt)
-endif(LIB_RT)
-
-########################################################################
-# Boost C++ general requirement
-########################################################################
-
-#set(Boost_USE_STATIC_LIBS        ON)
-#set(Boost_USE_MULTITHREADED      ON)
-#set(Boost_USE_STATIC_RUNTIME    OFF)
+endif(NOT HAVE_DL)
 
-option(WITH_CPP11 "Compile with C++11 support" OFF)
+find_package(Boost 1.70 REQUIRED COMPONENTS
+  system regex date_time program_options thread)
 
-# The minimum requirement 
-find_package(Boost 1.46.1 REQUIRED COMPONENTS 
-  system filesystem thread regex signals date_time program_options)
 
 if(NOT Boost_FOUND) 
   message(ERROR "Unable to find Boost (>=1.46.1) library")
 endif(NOT Boost_FOUND)
 
-include_directories(${Boost_INCLUDE_DIRS})
-find_package(Boost COMPONENTS chrono)
-message(STATUS "Checking for Boost.Chrono: ${Boost_CHRONO_LIBRARY}")
-
-
-if(Boost_CHRONO_LIBRARY)
-  set(CHRONO_LIB ${Boost_CHRONO_LIBRARY} CACHE PATH "Boost chrono library path" FORCE)
-else(Boost_CHRONO_LIBRARY)
-  set(CHRONO_LIB "" CACHE PATH "Boost chrono not found" FORCE)
-  if(NOT WITH_CPP11)
-    message(FATAL_ERROR "Boost.Chrono was not found and WITH_CPP11 is false."
-      "Try to enable WITH_CPP11 in order to find C++11 chrono implementation.")
-  endif(NOT WITH_CPP11)
-endif(Boost_CHRONO_LIBRARY)
-
-########################################################################
-# C++11 capabilities                                                   #
-########################################################################
-if(WITH_CPP11) 
-  include(${PROJECT_SOURCE_DIR}/cmake/cpp11/cpp11.cmake)
-
-  if(NOT CHRONO_LIB)
-    cpp11_feature_detection(CHRONO)
-    if(NOT CPP11_HAS_CHRONO)
-      message(ERROR "Did not find required chrono support")
-    endif(NOT CPP11_HAS_CHRONO)
-  endif(NOT CHRONO_LIB)
-  # Helpers to refine the code when cpp11 enabled
-  cpp11_feature_detection(UNIQUE_PTR)
-  cpp11_feature_detection(SHARED_PTR) 
-  cpp11_feature_detection(DELETED_FUNCTIONS)
-  #cpp11_feature_detection(THREAD)
-
-  if(CPP11_ENABLED) 
-    set(boost_flags -I${Boost_INCLUDE_DIRS})
-    # A simple date_time program : will fail to compile if boost 
-    # was linked to a non c++11 compatible standard library
-    #   this handle Clang that links against different lib*c++ depending 
-    #   on c++11 flags
-    cpp11_lib_support(Boost_DATE_TIME "#include <boost/date_time/posix_time/posix_time.hpp>
-#include <iostream>
-
-using namespace boost::posix_time\;
-
-int main(int argc, char *argv[]) {
-  ptime today(second_clock::local_time())\;
-  std::cout<<today<<std::endl\;
-  return 0\;
-}" ${boost_flags} ${Boost_DATE_TIME_LIBRARY})
-
-
-    if(NOT ${CPP11_SUPPORT_Boost_DATE_TIME})
-      message(FATAL_ERROR " Boost.DATE_TIME library cannot be used with C++11")
-    endif(NOT ${CPP11_SUPPORT_Boost_DATE_TIME})
- 
-    cpp11_lib_support(Boost_PROGRAM_OPTIONS "#include <boost/program_options.hpp>
-#include <iostream>
-
-namespace po=boost::program_options\;
-
-namespace {
-  po::options_description opt(\"Test:\")\;
-}
-
-int main(int argc, char *argv[]) {
-  opt.add_options()
-  (\"help,h\", \"should print help\")
-  (\"val,v\", po::value< std::vector<std::string> >(), \"A set of strings\")
-  (\"int,i\", po::value<int>()->implicit_value(0), \"An integer\")\;
-
-  po::variables_map vals\;
-
-  try {
-    po::store(po::command_line_parser(argc,argv).options(opt).run(), vals)\;
-    po::notify(vals)\;
-  } catch(po::error) {
-    return 1\;
-  }
-  return 0\;
-}" ${boost_flags} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-    # this test if boost/get_pointer defines get_pointer for std::shared_ptr
-    if(CPP11_HAS_SHARED_PTR)
-      file(WRITE ${CMAKE_BINARY_DIR}/boost_get_pointer_test.cc "#include <memory>
-#include <boost/get_pointer.hpp>
-
-int main(int argv, char *argc[]) {
-  std::shared_ptr<int> foo = std::make_shared<int>(0);
-  return boost::get_pointer(foo)==foo.get()?0:1; 
-}
-") 
-      try_compile(success
-	${CMAKE_BINARY_DIR}
-	${CMAKE_BINARY_DIR}/boost_get_pointer_test.cc
-	COMPILE_DEFINITIONS ${CPP11_COMPILER_SWITCH} ${boost_flags}
-	CMAKE_FLAGS 
-	  -DCMAKE_EXE_LINKER_FLAGS:STRING=${CPP11_link_flags} 
-	  -DLINK_LIBRARIES:STRING=${LIBS}
-	OUTPUT_VARIABLE OUT)
-      set(CPP11_BOOST_GET_POINTER_STD ${success})
-      if(NOT success)
-	file(WRITE ${CMAKE_BINARY_DIR}/boost_get_pointer_test.out ${OUT})
-      endif(NOT success)
-      message(STATUS "Test if boost::get_pointer support std::shared_ptr: ${CPP11_BOOST_GET_POINTER_STD}") 
-    endif(CPP11_HAS_SHARED_PTR)
-  
-
-    if(NOT ${CPP11_SUPPORT_Boost_PROGRAM_OPTIONS})
-      message(FATAL_ERROR " Boost.Program_Options library cannot be used with C++11")
-    endif(NOT ${CPP11_SUPPORT_Boost_PROGRAM_OPTIONS})
-
-    add_definitions(${CPP11_COMPILER_SWITCH})
-    # SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
-    #   CACHE STRING "Flags used by the linker during the creation of dll's.")
-    # set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} ${CPP11_LINK_FLAGS})
-    # set(CMAKE_LINK_LIBRARY_FLAGS ${CMAKE_LINK_LIBRARY_FLAGS} ${CPP11_LINK_FLAGS})
-    # message(STATUS "CPP11_LINK_FLAGS=${CPP11_LINK_FLAGS}")
-    # message(STATUS "CMAKE_LINK_LIBRARY_FLAGS=${CMAKE_LINK_LIBRARY_FLAGS}")
-    # # The xcode stuff
-    # set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x")
-    # set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-  endif(CPP11_ENABLED)
-else(WITH_CPP11)
-  # ensure that cpp11 is not enabled
-  set(CPP11_ENABLED FALSE)
-endif(WITH_CPP11)
-
-message(STATUS "CPP11 enabled: ${CPP11_ENABLED}")
-message(STATUS "CHRONO_LIB: ${CHRONO_LIB}")
-
 ########################################################################
 # Europa                                                               #
 ########################################################################
-
 option(WITH_EUROPA "Enable Europa plugin." ON) 
 
-if(WITH_EUROPA) 
+if(WITH_EUROPA)
   find_package(Europa
     COMPONENTS PlanDatabase ConstraintEngine TemporalNetwork Utils TinyXml 
-    NDDL RulesEngine Solvers System)
+     NDDL RulesEngine Solvers System)
   if(NOT EUROPA_FOUND)
-    message(FATAL_ERROR "Failed to find Europa while WITH_EUROPA is ON")
+     message(FATAL_ERROR "Failed to find Europa while WITH_EUROPA is ON")
   endif(NOT EUROPA_FOUND)
 endif(WITH_EUROPA)
 
+
 ########################################################################
 # Doxygen                                                              #
 ########################################################################

extra/CMakeLists.txt

@@ -35,26 +35,24 @@
 
 add_custom_target(plugins COMMENT "TREX plugins")
 
-macro(trex_plugin name src)
-  add_library(${name}_pg SHARED ${src} ${ARGN})
-  add_dependencies(plugins ${name}_pg)
-  install(TARGETS ${name}_pg DESTINATION ${TREX_SHARED}/plugins OPTIONAL 
-    EXPORT trex-plugins)
-  trex_cfg(cfg ${TREX_SHARED})
-  set_property(GLOBAL APPEND PROPERTY ${PROJECT_NAME}_CFGS 
-    ${CMAKE_CURRENT_BINARY_DIR})
-  trex_lib(${name}_pg FALSE)
+macro(trex_plugin name)
+  add_library(${name} SHARED)
+  set_target_properties(${name} PROPERTIES OUTPUT_NAME "${name}_pg")
+  add_dependencies(plugins ${name})
+  install(
+    TARGETS ${name} 
+    EXPORT trex_pg
+    LIBRARY DESTINATION shared/trex/plugins
+  )
 endmacro(trex_plugin)
 
-# the directories where plugins are located
-add_subdirectory(Wt)
-add_subdirectory(REST)
-add_subdirectory(witre.old)
-# add_subdirectory(witre)
-add_subdirectory(europa)
+option(WITH_EUROPA "Enable Europa plugin." ON) 
+
+if(WITH_EUROPA)
+  add_subdirectory(europa)
+endif(WITH_EUROPA)
 
 # 3rd party plug-ins
 add_subdirectory(third_party)
 
-# examples 
-add_subdirectory(examples)
+