Author: abroekhuis
Date: Tue Jan 14 09:56:50 2014
New Revision: 1557999
URL: http://svn.apache.org/r1557999
Log:
CELIX-108: Updated version information to use variables defined in the top
level CMakeLists.txt.
Modified:
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/cmake/CPackConfig-Installation.in
incubator/celix/trunk/cmake/installation.cmake
Modified: incubator/celix/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1557999&r1=1557998&r2=1557999&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Tue Jan 14 09:56:50 2014
@@ -32,14 +32,19 @@ IF(WIN32)
SET(CMAKE_C_FLAGS "-D_CRT_SECURE_NO_WARNINGS ${CMAKE_C_FLAGS}")
ENDIF()
+# Set version for the whole package/release
+SET(CELIX_MAJOR "0")
+SET(CELIX_MINOR "0")
+SET(CELIX_MICRO "1")
+SET(CELIX_QUALIFIER "incubation")
+
enable_testing()
include(cmake/Includes.cmake)
-
include(cmake/installation.cmake)
-
include(UseDoxygen)
+# Default bundle version
set(DEFAULT_VERSION 0.0.1.incubation)
## New sub project must use a buildoption to be able to enable/disable the
project using the CMake Editor
Modified: incubator/celix/trunk/cmake/CPackConfig-Installation.in
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfig-Installation.in?rev=1557999&r1=1557998&r2=1557999&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfig-Installation.in (original)
+++ incubator/celix/trunk/cmake/CPackConfig-Installation.in Tue Jan 14 09:56:50
2014
@@ -20,10 +20,10 @@ SET(CPACK_GENERATOR "ZIP;STGZ")
SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;Apache
Celix;framework;/")
set(CPACK_PACKAGE_NAME "Apache Celix")
SET(CPACK_PACKAGE_DESCRIPTION "Package containing a release for Apache Celix")
-SET(CPACK_PACKAGE_FILE_NAME
"apache.celix-@FRAMEWORK_MAJOR@.@FRAMEWORK_MINOR@.@FRAMEWORK_PATCH@")
+SET(CPACK_PACKAGE_FILE_NAME
"apache.celix-@CELIX_MAJOR@.@CELIX_MINOR@.@CELIX_MICRO@.@CELIX_QUALIFIER@")
set(CPACK_PACKAGE_VENDOR "incubator.apache.org/celix")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Framework")
-set(CPACK_PACKAGE_VERSION_MAJOR "@FRAMEWORK_MAJOR@")
-set(CPACK_PACKAGE_VERSION_MINOR "@FRAMEWORK_MINOR@")
-set(CPACK_PACKAGE_VERSION_PATCH "@FRAMEWORK_PATCH@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@CELIX_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@CELIX_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@CELIX_MICRO@.@CELIX_QUALIFIER@")
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/LICENSE.txt")
Modified: incubator/celix/trunk/cmake/installation.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/installation.cmake?rev=1557999&r1=1557998&r2=1557999&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/installation.cmake (original)
+++ incubator/celix/trunk/cmake/installation.cmake Tue Jan 14 09:56:50 2014
@@ -15,11 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# Set version
-SET(FRAMEWORK_MAJOR "0")
-SET(FRAMEWORK_MINOR "0")
-SET(FRAMEWORK_PATCH "1.incubation")
-
SET(CMAKE_INSTALL_COMPONENT "Framework")
GET_FILENAME_COMPONENT(__cmake_path ${CMAKE_COMMAND} PATH)
FIND_PROGRAM(CPACK_COMMAND cpack ${__cmake_path})
