Reorganize cmake files into dedicated cmake directory

Signed-off-by: Brenden Blanco <[email protected]>
mwesolowski · Sep 4, 2015 · 974e891 · 974e891
1 parent 5d89d5f
commit 974e891
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,8 @@ set(CMAKE_BUILD_TYPE Release)
 
 enable_testing()
 
-include(scripts/GetGitRevisionDescription.cmake)
+include(cmake/GetGitRevisionDescription.cmake)
+include(cmake/version.cmake)
 get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
 if(LIB64)
  set(LIBSUFFIX 64)
@@ -45,7 +46,6 @@ set(CMAKE_C_FLAGS "-Wall")
 set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
 endif()
 
-add_subdirectory(scripts)
 add_subdirectory(examples)
 add_subdirectory(src)
 add_subdirectory(tests)
diff --git a/scripts/GetGitRevisionDescription.cmake → cmake/GetGitRevisionDescription.cmake b/scripts/GetGitRevisionDescription.cmake → cmake/GetGitRevisionDescription.cmake
diff --git a/scripts/GetGitRevisionDescription.cmake.in → cmake/GetGitRevisionDescription.cmake.in b/scripts/GetGitRevisionDescription.cmake.in → cmake/GetGitRevisionDescription.cmake.in
diff --git a/scripts/bump_version.cmake → cmake/bump_version.cmake b/scripts/bump_version.cmake → cmake/bump_version.cmake
diff --git a/scripts/CMakeLists.txt → cmake/version.cmake b/scripts/CMakeLists.txt → cmake/version.cmake
@@ -19,7 +19,5 @@ endif()
 
 # strip leading 'v', and make unique for the tag
 message(STATUS "Revision is ${REVISION}")
-set(REVISION "${REVISION}" PARENT_SCOPE)
 # rpm/deb packaging uses this, only works on whole tag numbers
 string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)
-set(REVISION_LAST "${REVISION_LAST}" PARENT_SCOPE)