mirror of
https://github.com/boostorg/beast.git
synced 2025-06-25 03:51:36 +02:00
Make CMakeLists.txt compatible with version 3.8
Make call to target_sources conditional Replace $<CXX_COMPILER_ID:compiler_ids> expressions with individual ones
This commit is contained in:
committed by
Mohammad Nejati
parent
bb42991e17
commit
bed0e1be3c
@ -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
|
||||
|
@ -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")
|
||||
|
||||
|
Reference in New Issue
Block a user