From dbd29f3c45344254a59a42d3a01148e8d38d2778 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 7 Mar 2012 23:32:29 +0100 Subject: [PATCH] cmake: split out the maintenance targets to a new cmake module This makes the top level CMakeLists.txt easier to follow. --- CMakeLists.txt | 26 ++------------------------ cmake_modules/MaintenanceTools.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 cmake_modules/MaintenanceTools.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index aee9581..7db3067 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ set(PROJECT_APIVER set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/") +include (MaintenanceTools) + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) set(DOC_OUTPUT_PATH ${CMAKE_BINARY_DIR}/doc) @@ -76,30 +78,6 @@ set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG=1 -Werror") set(CMAKE_C_FLAGS_RELEASE "-O2") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") -# Use git for some maintainance tasks -find_package(Git) -if(GIT_FOUND) - set(ARCHIVE_PREFIX ${CMAKE_PROJECT_NAME}-${PROJECT_VER}) - find_program(DATE_EXECUTABLE date DOC "date command line program") - if (DATE_EXECUTABLE) - message(STATUS "Found date: " ${DATE_EXECUTABLE}) - message(STATUS "Generator is: " ${CMAKE_GENERATOR}) - - # XXX: using $(shell CMD) works only with Unix Makefile - if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") - message(STATUS " - \"git archive\" will use the date too!") - set(ARCHIVE_PREFIX ${ARCHIVE_PREFIX}-$\(shell ${DATE_EXECUTABLE} +%Y%m%d%H%M\)) - endif() - endif() - add_custom_target(archive - COMMAND ${GIT_EXECUTABLE} archive -o \"${ARCHIVE_PREFIX}.tar.gz\" --prefix=\"${ARCHIVE_PREFIX}/\" HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - - add_custom_target(changelog - COMMAND ${GIT_EXECUTABLE} log --pretty=\"format:%ai %aN <%aE>%n%n%x09* %s%d%n\" > ChangeLog - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -endif(GIT_FOUND) - # Add library project add_subdirectory(src) add_subdirectory(doc) diff --git a/cmake_modules/MaintenanceTools.cmake b/cmake_modules/MaintenanceTools.cmake new file mode 100644 index 0000000..4b90336 --- /dev/null +++ b/cmake_modules/MaintenanceTools.cmake @@ -0,0 +1,27 @@ +# Use git for some maintenance tasks +find_package(Git) +if(GIT_FOUND) + + # Add an 'archive' target to generate a compressed archive from the git source code + set(ARCHIVE_PREFIX ${CMAKE_PROJECT_NAME}-${PROJECT_VER}) + find_program(DATE_EXECUTABLE date DOC "date command line program") + if (DATE_EXECUTABLE) + message(STATUS "Found date: " ${DATE_EXECUTABLE}) + message(STATUS "Generator is: " ${CMAKE_GENERATOR}) + + # XXX: using $(shell CMD) works only with Unix Makefile + if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") + message(STATUS " - \"git archive\" will use the date too!") + set(ARCHIVE_PREFIX ${ARCHIVE_PREFIX}-$\(shell ${DATE_EXECUTABLE} +%Y%m%d%H%M\)) + endif() + endif() + add_custom_target(archive + COMMAND ${GIT_EXECUTABLE} archive -o \"${CMAKE_BINARY_DIR}/${ARCHIVE_PREFIX}.tar.gz\" --prefix=\"${ARCHIVE_PREFIX}/\" HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + + # Add a 'changelog' target to generate a qausi-GNU-style changelog, it may + # be used by distributors to ship when building their packages. + add_custom_target(changelog + COMMAND ${GIT_EXECUTABLE} log --pretty=\"format:%ai %aN <%aE>%n%n%x09* %s%d%n\" > \"${CMAKE_BINARY_DIR}/ChangeLog\" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif(GIT_FOUND) -- 2.1.4