Revert "compile definitions for conditionally compiling"
This reverts commit 173fb76367
.
release/4.3a0
parent
dc4842c727
commit
6bd1c7bc61
|
@ -6,12 +6,6 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH)
|
||||||
set(CMAKE_MACOSX_RPATH 0)
|
set(CMAKE_MACOSX_RPATH 0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(GTSAM_NO_BOOST_CPP17 "Require and use boost" ON)
|
|
||||||
|
|
||||||
if (GTSAM_NO_BOOST_CPP17)
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Set the version number for the library
|
# Set the version number for the library
|
||||||
set (GTSAM_VERSION_MAJOR 4)
|
set (GTSAM_VERSION_MAJOR 4)
|
||||||
set (GTSAM_VERSION_MINOR 3)
|
set (GTSAM_VERSION_MINOR 3)
|
||||||
|
@ -57,11 +51,7 @@ endif()
|
||||||
include(cmake/HandleGeneralOptions.cmake) # CMake build options
|
include(cmake/HandleGeneralOptions.cmake) # CMake build options
|
||||||
|
|
||||||
# Libraries:
|
# Libraries:
|
||||||
if (GTSAM_NO_BOOST_CPP17)
|
include(cmake/HandleBoost.cmake) # Boost
|
||||||
include(cmake/HandleBoost.cmake) # Boost
|
|
||||||
add_definitions(-DNO_BOOST_CPP17)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(cmake/HandleCCache.cmake) # ccache
|
include(cmake/HandleCCache.cmake) # ccache
|
||||||
include(cmake/HandleCPack.cmake) # CPack
|
include(cmake/HandleCPack.cmake) # CPack
|
||||||
include(cmake/HandleEigen.cmake) # Eigen3
|
include(cmake/HandleEigen.cmake) # Eigen3
|
||||||
|
|
Loading…
Reference in New Issue