guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for newer boost

Browse Source
This commit is contained in:
LAVAUX Guilhem 2020-04-14 17:46:14 +02:00
parent e4924917b9
commit 3773c1ab43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/external_build.cmake vendored
View File

@ -252,7 +252,7 @@ ELSE (INTERNAL_BOOST)
endif() endif()
if (${Boost_VERSION} VERSION_GREATER_EQUAL 1.70.0) if (${Boost_VERSION} VERSION_GREATER_EQUAL 1.70.0)
set(Boost_DEP Boost::headers) set(Boost_DEP Boost::headers)
set(Boost_TARGET Boost::headers PARENT_SCOPE) set(Boost_TARGET Boost::headers)
endif() endif()
endif (INTERNAL_BOOST) endif (INTERNAL_BOOST)
mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES) mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES)

2
src/CMakeLists.txt
View File

@ -96,7 +96,7 @@ if (BUILD_SHARED_LIBS)
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
else (BUILD_SHARED_LIBS) else (BUILD_SHARED_LIBS)
add_library(CosmoTool STATIC ${CosmoTool_SRCS} $<TARGET_OBJECTS:CosmoHDF5>) add_library(CosmoTool STATIC ${CosmoTool_SRCS} $<TARGET_OBJECTS:CosmoHDF5>)
target_link_libraries(CosmoTool) target_link_libraries(CosmoTool ${CosmoTool_LIBS})
set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON)
add_dependencies(CosmoTool ${cosmotool_DEPS}) add_dependencies(CosmoTool ${cosmotool_DEPS})
endif (BUILD_SHARED_LIBS) endif (BUILD_SHARED_LIBS)