fix CMakeLists again...

sewenew · Sep 21, 2018 · eb3e6ae · eb3e6ae
1 parent 776108e
commit eb3e6ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,17 +39,11 @@ try_compile(HAVE_STRING_VIEW
             "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
             "${CMAKE_CURRENT_SOURCE_DIR}/try_compile/try_string_view.cpp")
 
-if (HAVE_STRING_VIEW)
-    add_definitions(-DHAVE_STRING_VIEW)
-endif()
-
 try_compile(HAVE_OPTIONAL
             "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
             "${CMAKE_CURRENT_SOURCE_DIR}/try_compile/try_optional.cpp")
 
-if (HAVE_OPTIONAL)
-    add_definitions(-DHAVE_OPTIONAL)
-endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/config.h)
 
 add_subdirectory(test)
 

diff --git a/config.h.in b/config.h.in
@@ -0,0 +1,2 @@
+#cmakedefine HAVE_STRING_VIEW
+#cmakedefine HAVE_OPTIONAL
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#cmakedefine HAVE_STRING_VIEW
		#cmakedefine HAVE_OPTIONAL