Add caching for cxx_feature_check (#573)

105ac14b · Yangqing Jia · Dominic Hamon · 64d4805d · 105ac14b
Commit 105ac14b authored Apr 23, 2018 by Yangqing Jia Committed by Dominic Hamon Apr 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 17 deletions

CXXFeatureCheck.cmake cmake/CXXFeatureCheck.cmake +19 -17

No files found.
--- a/cmake/CXXFeatureCheck.cmake
+++ b/cmake/CXXFeatureCheck.cmake
@@ -27,25 +27,27 @@ function(cxx_feature_check FILE)
    return()
  endif()
-  message("-- Performing Test ${FEATURE}")
+  if (NOT DEFINED COMPILE_${FEATURE})
-  if(CMAKE_CROSSCOMPILING)
+    message("-- Performing Test ${FEATURE}")
-    try_compile(COMPILE_${FEATURE}
+    if(CMAKE_CROSSCOMPILING)
-            ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
+      try_compile(COMPILE_${FEATURE}
-            CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
+              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-            LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
+              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-    if(COMPILE_${FEATURE})
+              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
-      message(WARNING
+      if(COMPILE_${FEATURE})
-            "If you see build failures due to cross compilation, try setting HAVE_${VAR} to 0")
+        message(WARNING
-      set(RUN_${FEATURE} 0)
+              "If you see build failures due to cross compilation, try setting HAVE_${VAR} to 0")
+        set(RUN_${FEATURE} 0)
+      else()
+        set(RUN_${FEATURE} 1)
+      endif()
    else()
-      set(RUN_${FEATURE} 1)
+      message("-- Performing Test ${FEATURE}")
+      try_run(RUN_${FEATURE} COMPILE_${FEATURE}
+              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
+              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
+              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
    endif()
-  else()
-    message("-- Performing Test ${FEATURE}")
-    try_run(RUN_${FEATURE} COMPILE_${FEATURE}
-            ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-            CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-            LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
  endif()
  if(RUN_${FEATURE} EQUAL 0)