Skip to content

Commit

Permalink
Make CMakeLists.txt compatible with version 3.8
Browse files Browse the repository at this point in the history
Make call to target_sources conditional
Replace $<CXX_COMPILER_ID:compiler_ids> expressions with individual ones
  • Loading branch information
ashtum committed Nov 27, 2024
1 parent bb42991 commit ee44b0d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
10 changes: 6 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,13 @@ add_library(Boost::beast ALIAS boost_beast)
target_include_directories(boost_beast INTERFACE include)
target_link_libraries(boost_beast INTERFACE ${BOOST_BEAST_DEPENDENCIES})
target_compile_features(boost_beast INTERFACE cxx_std_11)
file(GLOB_RECURSE BOOST_BEAST_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost PREFIX "" FILES ${BOOST_BEAST_HEADERS})
target_sources(boost_beast PRIVATE ${BOOST_BEAST_HEADERS} build.jam)

if (BOOST_BEAST_IS_ROOT)
file(GLOB_RECURSE BOOST_BEAST_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost PREFIX "" FILES ${BOOST_BEAST_HEADERS})
target_sources(boost_beast PRIVATE ${BOOST_BEAST_HEADERS} build.jam)
endif ()
#-------------------------------------------------
#
# Tests
Expand Down
10 changes: 6 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ add_library(lib-zlib STATIC
extern/zlib-1.2.12/uncompr.c
extern/zlib-1.2.12/zutil.c)
target_compile_options(lib-zlib PRIVATE
$<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-w>
$<$<CXX_COMPILER_ID:MSVC>:/wd4127>
$<$<CXX_COMPILER_ID:MSVC>:/wd4244>
$<$<CXX_COMPILER_ID:MSVC>:/wd4131>)
$<$<C_COMPILER_ID:GNU>:-w>
$<$<C_COMPILER_ID:Clang>:-w>
$<$<C_COMPILER_ID:AppleClang>:-w>
$<$<C_COMPILER_ID:MSVC>:/wd4127>
$<$<C_COMPILER_ID:MSVC>:/wd4244>
$<$<C_COMPILER_ID:MSVC>:/wd4131>)
target_include_directories(lib-zlib PUBLIC extern/zlib-1.2.12)
set_target_properties(lib-zlib PROPERTIES FOLDER "static-libs")

Expand Down

0 comments on commit ee44b0d

Please sign in to comment.