Skip to content

Commit 2108e64

Browse files
committed
compatibility with boost 1.89.00
1 parent 1f1ffcd commit 2108e64

4 files changed

Lines changed: 15 additions & 4 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
url = https://github.com/nlohmann/json.git
3232
[submodule "src/3rdparty/crow"]
3333
path = src/3rdparty/crow
34-
url = https://github.com/CrowCpp/Crow.git
34+
url = https://github.com/aumuell/crow

cmake/CoviseHelperMacros.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ MACRO(COVISE_FIND_CUDA)
11591159
ENDMACRO(COVISE_FIND_CUDA)
11601160

11611161
MACRO(COVISE_FIND_BOOST)
1162-
set(BOOST_COMPONENTS chrono program_options system thread filesystem iostreams date_time serialization regex locale)
1162+
set(BOOST_COMPONENTS chrono program_options thread filesystem iostreams date_time serialization regex locale)
11631163
IF(WIN32)
11641164
#set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
11651165
ENDIF(WIN32)
@@ -1172,4 +1172,15 @@ MACRO(COVISE_FIND_BOOST)
11721172
message("Did not find boost_atomic")
11731173
endif()
11741174
endif()
1175+
if (Boost_FOUND)
1176+
if(Boost_VERSION VERSION_LESS "108900")
1177+
set(COMPONENTS ${BOOST_COMPONENTS} system)
1178+
covise_find_package(Boost COMPONENTS ${BOOST_COMPONENTS} QUIET REQUIRED)
1179+
if (NOT Boost_FOUND)
1180+
message("Did not find boost_system")
1181+
endif()
1182+
else()
1183+
add_library(Boost::system ALIAS Boost::boost)
1184+
endif()
1185+
endif()
11751186
ENDMACRO(COVISE_FIND_BOOST)

src/3rdparty/deskvox

0 commit comments

Comments
 (0)