Skip to content

Commit

Permalink
semicolon delimit generator expressions and reenable conan
Browse files Browse the repository at this point in the history
  • Loading branch information
Austin McCartney authored and Austin McCartney committed Aug 12, 2018
1 parent c075dcb commit 32b5037
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -85,7 +85,7 @@ target_compile_definitions( stlab INTERFACE $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>
add_subdirectory( stlab/concurrency )

if ( stlab.testing OR stlab.boost_variant OR stlab.boost_optional )
if( EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake AND OFF )
if( EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
include( ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake )

#
Expand All @@ -99,8 +99,8 @@ if ( stlab.testing OR stlab.boost_variant OR stlab.boost_optional )
# We provide aliases to the conan target to mimic the native findBoost
# functionality
#
add_library( Boost::boost ALIAS CONAN_PKG::Boost )
add_library( Boost::unit_test_framework ALIAS CONAN_PKG::Boost )
add_library( Boost::boost ALIAS CONAN_PKG::boost )
add_library( Boost::unit_test_framework ALIAS CONAN_PKG::boost )
else()

#
Expand Down
8 changes: 4 additions & 4 deletions cmake/stlab/development/AppleClang.cmake
Expand Up @@ -4,14 +4,14 @@ set( stlab_AppleClang_coverage_flags --coverage )
set( stlab_AppleClang_release_flags )

string(CONCAT generator
"${stlab_AppleClang_base_flags}"
"${stlab_AppleClang_base_flags};"
"$<$<OR:$<CONFIG:DEBUG>,"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_AppleClang_debug_flags}>"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_AppleClang_debug_flags};>"
"$<$<OR:$<CONFIG:RELEASE>,"
"$<CONFIG:RELWITHDEBINFO>,"
"$<CONFIG:MINSIZEREL>>:${stlab_AppleClang_release_flags}>"
"$<CONFIG:MINSIZEREL>>:${stlab_AppleClang_release_flags};>"
"$<$<AND:$<CONFIG:DEBUG>,"
"$<BOOL:${stlab.coverage}>>:${stlab_AppleClang_debug_flags}>")
"$<BOOL:${stlab.coverage}>>:${stlab_AppleClang_debug_flags};>")

target_compile_options(development INTERFACE
$<$<CXX_COMPILER_ID:AppleClang>:${generator}>)
Expand Down
8 changes: 4 additions & 4 deletions cmake/stlab/development/Clang.cmake
Expand Up @@ -4,14 +4,14 @@ set( stlab_Clang_coverage_flags --coverage )
set( stlab_Clang_release_flags )

string(CONCAT generator
"${stlab_Clang_base_flags}"
"${stlab_Clang_base_flags};"
"$<$<OR:$<CONFIG:DEBUG>,"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_Clang_debug_flags}>"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_Clang_debug_flags};>"
"$<$<OR:$<CONFIG:RELEASE>,"
"$<CONFIG:RELWITHDEBINFO>,"
"$<CONFIG:MINSIZEREL>>:${stlab_Clang_release_flags}>"
"$<CONFIG:MINSIZEREL>>:${stlab_Clang_release_flags};>"
"$<$<AND:$<CONFIG:DEBUG>,"
"$<BOOL:${stlab.coverage}>>:${stlab_Clang_debug_flags}>")
"$<BOOL:${stlab.coverage}>>:${stlab_Clang_debug_flags};>")

target_compile_options(development INTERFACE
$<$<CXX_COMPILER_ID:Clang>:${generator}>)
Expand Down
8 changes: 4 additions & 4 deletions cmake/stlab/development/GNU.cmake
Expand Up @@ -4,14 +4,14 @@ set( stlab_GNU_coverage_flags --coverage )
set( stlab_GNU_release_flags )

string(CONCAT generator
"${stlab_GNU_base_flags}"
"${stlab_GNU_base_flags};"
"$<$<OR:$<CONFIG:DEBUG>,"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_GNU_debug_flags}>"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_GNU_debug_flags};>"
"$<$<OR:$<CONFIG:RELEASE>,"
"$<CONFIG:RELWITHDEBINFO>,"
"$<CONFIG:MINSIZEREL>>:${stlab_GNU_release_flags}>"
"$<CONFIG:MINSIZEREL>>:${stlab_GNU_release_flags};>"
"$<$<AND:$<CONFIG:DEBUG>,"
"$<BOOL:${stlab.coverage}>>:${stlab_GNU_debug_flags}>")
"$<BOOL:${stlab.coverage}>>:${stlab_GNU_debug_flags};>")

target_compile_options(development INTERFACE
$<$<CXX_COMPILER_ID:GNU>:${generator}>)
Expand Down
8 changes: 4 additions & 4 deletions cmake/stlab/development/MSVC.cmake
Expand Up @@ -4,14 +4,14 @@ set( stlab_MSVC_coverage_flags )
set( stlab_MSVC_release_flags )

string(CONCAT generator
"${stlab_MSVC_base_flags}"
"${stlab_MSVC_base_flags};"
"$<$<OR:$<CONFIG:DEBUG>,"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_MSVC_debug_flags}>"
"$<CONFIG:RELWITHDEBINFO>>:${stlab_MSVC_debug_flags};>"
"$<$<OR:$<CONFIG:RELEASE>,"
"$<CONFIG:RELWITHDEBINFO>,"
"$<CONFIG:MINSIZEREL>>:${stlab_MSVC_release_flags}>"
"$<CONFIG:MINSIZEREL>>:${stlab_MSVC_release_flags};>"
"$<$<AND:$<CONFIG:DEBUG>,"
"$<BOOL:${stlab.coverage}>>:${stlab_MSVC_debug_flags}>")
"$<BOOL:${stlab.coverage}>>:${stlab_MSVC_debug_flags};>")

target_compile_options(development INTERFACE
$<$<CXX_COMPILER_ID:GNU>:${generator}>)
Expand Down

0 comments on commit 32b5037

Please sign in to comment.