From 0a6224ca6373240a797d4833288061af3dbc01eb Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Wed, 29 Jul 2009 14:30:14 +0000 Subject: [PATCH] version and install --- kernel/cmake/BBTKVersion.cmake | 4 ++-- kernel/install/cpack/CMakeLists.txt | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/cmake/BBTKVersion.cmake b/kernel/cmake/BBTKVersion.cmake index 651d828..336c6e8 100644 --- a/kernel/cmake/BBTKVersion.cmake +++ b/kernel/cmake/BBTKVersion.cmake @@ -1,9 +1,9 @@ #----------------------------------------------------------------------------- # BBTK version number -SET(BBTK_VERSION_DATE "09/01/2009") +SET(BBTK_VERSION_DATE "26/07/2009") SET(BBTK_MAJOR_VERSION 0) SET(BBTK_MINOR_VERSION 9) -SET(BBTK_BUILD_VERSION 1) +SET(BBTK_BUILD_VERSION 2) SET(BBTK_VERSION "${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") # Now in bbtkConfigure.h file (cf. core/src) diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt index 986a396..5417e12 100644 --- a/kernel/install/cpack/CMakeLists.txt +++ b/kernel/install/cpack/CMakeLists.txt @@ -23,7 +23,12 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION}) # There is a bug in NSI that does not handle full unix paths properly. Make # sure there is at least one set of four (4) backlasshes. -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") +IF(WIN32) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") +ELSE(WIN32) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") +ENDIF(WIN32) + #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "bbtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32 AND NOT UNIX) #EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") -- 2.45.1