diff options
author | yuta.256 <yuta.256@b7c3aa3b-274f-0410-ae0b-edc9d07c929d> | 2015-02-19 13:38:17 +0000 |
---|---|---|
committer | yuta.256 <yuta.256@b7c3aa3b-274f-0410-ae0b-edc9d07c929d> | 2015-02-19 13:38:17 +0000 |
commit | 79858ed9e32ea21f007d75883183e6a00b39a492 (patch) | |
tree | 303948a5015f7b3d48c51988ed8b5837bda5112b | |
parent | 4b612dd9f9fa2ad7953815331ced1183112ed42e (diff) | |
download | platform_external_libdivsufsort-79858ed9e32ea21f007d75883183e6a00b39a492.tar.gz platform_external_libdivsufsort-79858ed9e32ea21f007d75883183e6a00b39a492.tar.bz2 platform_external_libdivsufsort-79858ed9e32ea21f007d75883183e6a00b39a492.zip |
Fixed issue 4: Fixed version numbering in CMakeLists.txt.
-rw-r--r-- | CMakeLists.txt | 27 | ||||
-rw-r--r-- | VERSION | 1 | ||||
-rw-r--r-- | VERSION.cmake | 24 | ||||
-rw-r--r-- | lib/CMakeLists.txt | 8 |
4 files changed, 29 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a1388c6..aa05591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,38 +3,13 @@ cmake_minimum_required(VERSION 2.4.4) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") include(AppendCompilerFlags) -## SVN revision ## -set(SVN_REVISION "") -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") - execute_process(COMMAND svn info --xml - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - OUTPUT_VARIABLE SVN_INFO ERROR_QUIET) - if(SVN_INFO) - string(REGEX MATCH "<entry[^>]+" SVN_REVISION "${SVN_INFO}") - string(REGEX REPLACE "^.*revision=\"([0-9]+)\".*$" "\\1" SVN_REVISION "${SVN_REVISION}") - endif(SVN_INFO) -endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") - ## Project information ## project(libdivsufsort C) set(PROJECT_VENDOR "Yuta Mori") set(PROJECT_CONTACT "yuta.256@gmail.com") set(PROJECT_URL "http://libdivsufsort.googlecode.com/") set(PROJECT_DESCRIPTION "A lightweight suffix sorting library") -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" PROJECT_VERSION_FULL) -string(REGEX REPLACE "[\n\r]" "" PROJECT_VERSION_FULL "${PROJECT_VERSION_FULL}") -string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" PROJECT_VERSION_MAJOR "${PROJECT_VERSION_FULL}") -string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" PROJECT_VERSION_MINOR "${PROJECT_VERSION_FULL}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" PROJECT_VERSION_PATCH "${PROJECT_VERSION_FULL}") -set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") -math(EXPR LIBRARY_VERSION_MAJOR "1 + ${PROJECT_VERSION_MAJOR}") -set(LIBRARY_VERSION_MINOR "${PROJECT_VERSION_MINOR}") -set(LIBRARY_VERSION_PATCH "${PROJECT_VERSION_PATCH}") -set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}") -set(LIBRARY_VERSION_FULL "${LIBRARY_VERSION}.${LIBRARY_VERSION_PATCH}") -if(SVN_REVISION) - set(PROJECT_VERSION_FULL "svn-r${SVN_REVISION}") -endif(SVN_REVISION) +include(VERSION.cmake) ## CPack configuration ## set(CPACK_GENERATOR "TGZ;TBZ2;ZIP") diff --git a/VERSION b/VERSION deleted file mode 100644 index 227cea2..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.0.0 diff --git a/VERSION.cmake b/VERSION.cmake new file mode 100644 index 0000000..61c5923 --- /dev/null +++ b/VERSION.cmake @@ -0,0 +1,24 @@ +set(PROJECT_VERSION_MAJOR "2") +set(PROJECT_VERSION_MINOR "0") +set(PROJECT_VERSION_PATCH "2") +set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") +set(PROJECT_VERSION_FULL "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + +set(LIBRARY_VERSION "3.0.1") +set(LIBRARY_SOVERSION "3") + +## SVN revision ## +set(SVN_REVISION "") +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") + execute_process(COMMAND svn info --xml + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + OUTPUT_VARIABLE SVN_INFO ERROR_QUIET) + if(SVN_INFO) + string(REGEX MATCH "<entry[^>]+" SVN_REVISION "${SVN_INFO}") + string(REGEX REPLACE "^.*revision=\"([0-9]+)\".*$" "\\1" SVN_REVISION "${SVN_REVISION}") + endif(SVN_INFO) +endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") + +if(SVN_REVISION) + set(PROJECT_VERSION_FULL "svn-r${SVN_REVISION}") +endif(SVN_REVISION) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index ad35f37..abc90e6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -10,8 +10,8 @@ install(TARGETS divsufsort LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) set_target_properties(divsufsort PROPERTIES - VERSION "${LIBRARY_VERSION_FULL}" - SOVERSION "${LIBRARY_VERSION_MAJOR}" + VERSION "${LIBRARY_VERSION}" + SOVERSION "${LIBRARY_SOVERSION}" DEFINE_SYMBOL DIVSUFSORT_BUILD_DLL RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../examples") @@ -23,8 +23,8 @@ if(BUILD_DIVSUFSORT64) LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) set_target_properties(divsufsort64 PROPERTIES - VERSION "${LIBRARY_VERSION_FULL}" - SOVERSION "${LIBRARY_VERSION_MAJOR}" + VERSION "${LIBRARY_VERSION}" + SOVERSION "${LIBRARY_SOVERSION}" DEFINE_SYMBOL DIVSUFSORT_BUILD_DLL COMPILE_FLAGS "-DBUILD_DIVSUFSORT64" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../examples") |