diff options
| author | Roman Lebedev <lebedev.ri@gmail.com> | 2017-08-29 02:10:19 +0300 |
|---|---|---|
| committer | Dominic Hamon <dominichamon@users.noreply.github.com> | 2017-08-28 16:10:19 -0700 |
| commit | 6e06648133f65e336489be99d0b7448bd7839463 (patch) | |
| tree | 57dac588f408efa9c7152be61dff33120e2e9ccb /cmake | |
| parent | a271c36af93c7a3b19dfeb2aefa9ca77a58e52e4 (diff) | |
| download | google-benchmark-6e06648133f65e336489be99d0b7448bd7839463.tar.gz | |
Attempting to resolve a submoduling issues... (#439)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/AddCXXCompilerFlag.cmake | 2 | ||||
| -rw-r--r-- | cmake/CXXFeatureCheck.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/AddCXXCompilerFlag.cmake b/cmake/AddCXXCompilerFlag.cmake index 0b176ba..17d5f3d 100644 --- a/cmake/AddCXXCompilerFlag.cmake +++ b/cmake/AddCXXCompilerFlag.cmake @@ -38,7 +38,7 @@ function(add_cxx_compiler_flag FLAG) if(ARGV1) string(TOUPPER "_${VARIANT}" VARIANT) endif() - set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE) + set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${BENCHMARK_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE) endif() endfunction() diff --git a/cmake/CXXFeatureCheck.cmake b/cmake/CXXFeatureCheck.cmake index 1a454f8..b2a8217 100644 --- a/cmake/CXXFeatureCheck.cmake +++ b/cmake/CXXFeatureCheck.cmake @@ -22,7 +22,7 @@ function(cxx_feature_check FILE) string(TOUPPER ${FILE} VAR) string(TOUPPER "HAVE_${VAR}" FEATURE) if (DEFINED HAVE_${VAR}) - set(HAVE_${VAR} 1 CACHE INTERNAL "Feature test for ${FILE}" PARENT_SCOPE) + set(HAVE_${VAR} 1 PARENT_SCOPE) add_definitions(-DHAVE_${VAR}) return() endif() @@ -50,7 +50,7 @@ function(cxx_feature_check FILE) if(RUN_${FEATURE} EQUAL 0) message("-- Performing Test ${FEATURE} -- success") - set(HAVE_${VAR} 1 CACHE INTERNAL "Feature test for ${FILE}" PARENT_SCOPE) + set(HAVE_${VAR} 1 PARENT_SCOPE) add_definitions(-DHAVE_${VAR}) else() if(NOT COMPILE_${FEATURE}) |