Skip to content
Snippets Groups Projects

New features and bugfixes and build system improvements

Merged Reinhard Biegel requested to merge intech into servant
Files
270
+ 2
14
@@ -23,7 +23,6 @@ option(WITH_PROTOBUF_ARENA "Make use of protobuf arena allocation" ON)
option(WITH_DEBUG_POSTFIX "Use 'd' binary postfix on Windows platform" ON)
option(INSTALL_SYSTEM_RUNTIME_DEPS "Copy detected system runtime dependencies to install directory (i.e. MinGW system libraries)" OFF)
option(INSTALL_EXTRA_RUNTIME_DEPS "Copy detected third party runtime dependencies to install directory (i.e. required shared libraries found in specified CMAKE_PREFIX_PATH)" OFF)
option(WITH_MINGW_BOOST_1_72_FIX "Apply fix Boost 1.72 detection in MinGW environment (https://github.com/boostorg/boost_install/issues/33)" OFF)
option(WITH_ENDTOEND_TESTS "Create pyOpenPASS target for running end to end tests" OFF)
option(WITH_COVERAGE "Generate test coverage report using gcov (needs fastcov)" OFF)
@@ -77,15 +76,6 @@ if(WITH_SIMCORE OR WITH_TESTS)
find_package(OSI REQUIRED)
if(MINGW AND WITH_MINGW_BOOST_1_72_FIX)
# Bug in boost-install 1.72.0
# setting boost mingw version manually
# https://github.com/boostorg/boost_install/issues/33
string(REGEX MATCHALL "[0-9]+" _CVER_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
list(GET _CVER_COMPONENTS 0 _CVER_MAJOR)
list(GET _CVER_COMPONENTS 1 _CVER_MINOR)
set(Boost_COMPILER "mgw${_CVER_MAJOR}${_CVER_MINOR}")
endif()
set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost COMPONENTS filesystem REQUIRED)
@@ -164,9 +154,6 @@ add_compile_definitions(SUBDIR_LIB_COMPONENTS="${SUBDIR_LIB_COMPONENTS}")
add_compile_definitions(SUBDIR_XML_COMPONENTS="${SUBDIR_XML_COMPONENTS}")
if(MSVC)
if(WITH_DEBUG_POSTFIX)
set(CMAKE_DEBUG_POSTFIX "d")
endif()
add_compile_definitions(_CRT_SECURE_NO_DEPRECATE)
add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
@@ -188,4 +175,5 @@ if(WITH_DOC)
find_package(Sphinx REQUIRED)
endif()
###############################################################################
\ No newline at end of file
###############################################################################
Loading