From 974e89152171c6e974099c380af0c4a988f594fe Mon Sep 17 00:00:00 2001
From: Brenden Blanco <bblanco@plumgrid.com>
Date: Fri, 4 Sep 2015 09:36:37 -0700
Subject: [PATCH] Reorganize cmake files into dedicated cmake directory

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>
---
 CMakeLists.txt                                        | 4 ++--
 {scripts => cmake}/GetGitRevisionDescription.cmake    | 0
 {scripts => cmake}/GetGitRevisionDescription.cmake.in | 0
 {scripts => cmake}/bump_version.cmake                 | 0
 scripts/CMakeLists.txt => cmake/version.cmake         | 2 --
 5 files changed, 2 insertions(+), 4 deletions(-)
 rename {scripts => cmake}/GetGitRevisionDescription.cmake (100%)
 rename {scripts => cmake}/GetGitRevisionDescription.cmake.in (100%)
 rename {scripts => cmake}/bump_version.cmake (100%)
 rename scripts/CMakeLists.txt => cmake/version.cmake (90%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 664a649ec7bf..0178c3d6c9bf 100644
--- 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 b/cmake/GetGitRevisionDescription.cmake
similarity index 100%
rename from scripts/GetGitRevisionDescription.cmake
rename to cmake/GetGitRevisionDescription.cmake
diff --git a/scripts/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in
similarity index 100%
rename from scripts/GetGitRevisionDescription.cmake.in
rename to cmake/GetGitRevisionDescription.cmake.in
diff --git a/scripts/bump_version.cmake b/cmake/bump_version.cmake
similarity index 100%
rename from scripts/bump_version.cmake
rename to cmake/bump_version.cmake
diff --git a/scripts/CMakeLists.txt b/cmake/version.cmake
similarity index 90%
rename from scripts/CMakeLists.txt
rename to cmake/version.cmake
index c23e3d1987ff..1c43ae4f1fe0 100644
--- a/scripts/CMakeLists.txt
+++ b/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)