From 8d290bb140a51cb62df10ed12d497d19067e2b3a Mon Sep 17 00:00:00 2001 From: Martin Heistermann Date: Mon, 12 Aug 2019 13:38:51 +0200 Subject: [PATCH 1/2] Add option to build without boost --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f0e8eb..00c84b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,10 @@ set(COMISO_LINK_DIRECTORIES "") set(COMISO_LINK_LIBRARIES "") set(NEED_LAPACK "") +option(COMISO_BUILD_WITHOUT_BOOST "Build CoMISo without boost" OFF) + FIND_PACKAGE( Boost 1.59.0 COMPONENTS system filesystem regex QUIET) -if(Boost_FOUND) +if(Boost_FOUND AND NOT COMISO_BUILD_WITHOUT_BOOST) set (COMISO_BOOST_CONFIG_FILE_SETTINGS "#define COMISO_BOOST_AVAILABLE 1" ) list( APPEND COMISO_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS} ) list( APPEND COMISO_LINK_DIRECTORIES ${Boost_LIBRARY_DIR} ) @@ -58,7 +60,11 @@ if(Boost_FOUND) else() set (COMISO_BOOST_CONFIG_FILE_SETTINGS "#define COMISO_BOOST_AVAILABLE 0" ) - message (STATUS "Boost not found!") + if(COMISO_BUILD_WITHOUT_BOOST) + message (STATUS "Building without boost (COMISO_BUILD_WITHOUT_BOOST flag is set)") + else() + message (STATUS "Boost not found!") + endif() endif () -- GitLab From 8d3c0d5a38933ea95a2609b25f8c40ef89f4738a Mon Sep 17 00:00:00 2001 From: Martin Heistermann Date: Mon, 12 Aug 2019 13:40:59 +0200 Subject: [PATCH 2/2] Update Base submodule: fix build without comiso, fixes #6 --- Base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Base b/Base index f31f6e3..5c54ef0 160000 --- a/Base +++ b/Base @@ -1 +1 @@ -Subproject commit f31f6e3ae0a097c2e04bc750589e00ccc972feaf +Subproject commit 5c54ef0065f46b07dbea44644515a00665563235 -- GitLab