Merge pull request #4 from basiliscos/ivan/improve-cmake-2

tom-binary · web-flow · commit 2fe0482b6464 · 2016-11-17T16:04:18.000+08:00
Improve cmake-2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,17 +4,17 @@ project (StatsdClient)
 set (StatsdClient_VERSION_MAJOR 1)
 set (StatsdClient_VERSION_MINOR 0)
 
-include_directories ("${PROJECT_SOURCE_DIR}/src")
-add_subdirectory (src)
+include_directories ("src")
+add_subdirectory ("src")
 
 configure_file (
-  "${PROJECT_SOURCE_DIR}/src/StatsdClientConfig.h.in"
-  "${PROJECT_BINARY_DIR}/StatsdClientConfig.h"
+  "src/StatsdClientConfig.h.in"
+  "StatsdClientConfig.h"
   )
 
-target_compile_features(StatsdClient PRIVATE cxx_nullptr)
+set_property (SOURCE "StatsdClientConfig.h" PROPERTY GENERATED TRUE)
 
-include_directories("${PROJECT_BINARY_DIR}")
+target_compile_features(StatsdClient PRIVATE cxx_nullptr)
 
 install (FILES "${PROJECT_BINARY_DIR}/StatsdClientConfig.h"
          DESTINATION include)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(StatsdClient statsd_client.cpp)
 
-include_directories("${PROJECT_BINARY_DIR}")
+include_directories(${PROJECT_BINARY_DIR})
 
 install (TARGETS StatsdClient DESTINATION lib)
 install (FILES statsd_client.h DESTINATION include)
