Commit 974e8915 authored by Brenden Blanco's avatar Brenden Blanco

Reorganize cmake files into dedicated cmake directory

Signed-off-by: default avatarBrenden Blanco <bblanco@plumgrid.com>
parent 5d89d5fd
...@@ -7,7 +7,8 @@ set(CMAKE_BUILD_TYPE Release) ...@@ -7,7 +7,8 @@ set(CMAKE_BUILD_TYPE Release)
enable_testing() enable_testing()
include(scripts/GetGitRevisionDescription.cmake) include(cmake/GetGitRevisionDescription.cmake)
include(cmake/version.cmake)
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
if(LIB64) if(LIB64)
set(LIBSUFFIX 64) set(LIBSUFFIX 64)
...@@ -45,7 +46,6 @@ set(CMAKE_C_FLAGS "-Wall") ...@@ -45,7 +46,6 @@ set(CMAKE_C_FLAGS "-Wall")
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall") set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
endif() endif()
add_subdirectory(scripts)
add_subdirectory(examples) add_subdirectory(examples)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(tests) add_subdirectory(tests)
...@@ -19,7 +19,5 @@ endif() ...@@ -19,7 +19,5 @@ endif()
# strip leading 'v', and make unique for the tag # strip leading 'v', and make unique for the tag
message(STATUS "Revision is ${REVISION}") message(STATUS "Revision is ${REVISION}")
set(REVISION "${REVISION}" PARENT_SCOPE)
# rpm/deb packaging uses this, only works on whole tag numbers # rpm/deb packaging uses this, only works on whole tag numbers
string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST) string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)
set(REVISION_LAST "${REVISION_LAST}" PARENT_SCOPE)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment