Commit e436b1c2 authored by promayon's avatar promayon
Browse files

FIXED CamiTK version in exported find CamiTK

FIXED CamiTK API main page displays CamiTK version

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@166 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 45aa442a
......@@ -7,7 +7,7 @@ set(CAMITK_PROJECT_NAME "CamiTK")
set (CAMITK_VER_MAJ "3")
set (CAMITK_VER_MIN "0")
set (CAMITK_VER_NICKNAME "blue")
set (CAMITK_VER_PACKAGE_PAT "0") # patch version for package, change when appropriate
set (CAMITK_VER_PACKAGE_PAT "1") # patch version for package, change when appropriate
string(TOLOWER "${CAMITK_PROJECT_NAME}-${CAMITK_VER_MAJ}.${CAMITK_VER_MIN}" CAMITK_SHORT_VERSION_STRING)
......@@ -23,7 +23,7 @@ if(EXISTS ${CAMITK_SOURCE_DIR}/core/CamiTKVersion.h)
else()
# In svn checkouted source tree.
find_package(Subversion QUIET)
if(Subversion_FOUND)
if(Subversion_FOUND)
Subversion_WC_INFO(${CAMITK_SOURCE_DIR} CAMITK)
set (CAMITK_VER_PAT "${CAMITK_VER_PACKAGE_PAT}.${CAMITK_WC_REVISION}")
else(Subversion_FOUND)
......
......@@ -12,7 +12,8 @@
# Usual values for unix are /usr or /usr/local
#
# Therefore, in order to produce a proper deb for system-wide install, you can run something like:
# cmake -DCAMITK_INSTALL_ROOT=/usr -DCMAKE_BUILD_TYPE=Release ~/dev/camitk/pub/trunk/camitk/ -DACTION_ITKSEGMENTATION=TRUE -DACTION_ITKFILTERS=TRUE -DAPPLICATION_WIZARD=TRUE -DCOMPONENT_DICOM=TRUE -DCOMPONENT_ITKIMAGE=TRUE -DMML_GENERATE_XSD_LIB=TRUE
# sudo su
# cmake -DCAMITK_INSTALL_ROOT=/usr -DCMAKE_BUILD_TYPE=Release -DACTION_ITKSEGMENTATION=TRUE -DACTION_ITKFILTERS=TRUE -DAPPLICATION_WIZARD=TRUE -DCOMPONENT_DICOM=TRUE -DCOMPONENT_ITKIMAGE=TRUE -DCOMPONENT_MML=TRUE -DCOMPONENT_PHYSICALMODEL=TRUE -DMML_GENERATE_XSD_LIB=TRUE /home/promayon/Dev/CamiTK/camitk
# make camitk_package
#
# Once CAMITK_INSTALL_ROOT is properly defined, type "make camitk_package"
......@@ -39,6 +40,18 @@
# set(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
# set(CPACK_PACKAGE_INSTALL_DIRECTORY "/")
#
# There is a "bug"/packaging problem with CMake 2.8.7 and 2.8.8 on ubuntu 12.04
# The package that is produced is corrupted.
# The workaround (see http://cmake.3232098.n2.nabble.com/Creating-package-td7577614.html )
# mkdir tmp
# cp camitk-3.0.0-blue-ubuntu12.04_amd64.deb tmp
# cd tmp
# ar xv camitk-3.0.0-blue-ubuntu12.04_amd64.deb data.tar.gz
# tar xzvf data.tar.gz
# tar zcvf data.tgz ./usr
# mv data.tgz data.tar.gz
# ar rv camitk-3.0.0-blue-ubuntu12.04_amd64.deb data.tar.gz
......@@ -168,6 +181,7 @@ endif("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
# contact information
set(CPACK_PACKAGE_VENDOR "UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525")
set(CPACK_PACKAGE_CONTACT "http://camitk.imag.fr")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "CamiTK Developers <camitk-developers@lists.forge.imag.fr>")
# resource files
set(CPACK_RESOURCE_FILE_README "${CAMITK_SOURCE_DIR}/README")
......
......@@ -18,10 +18,10 @@
# Once found it is then easy to just use the CamiTK macros
# to build your extensions
# we need at least version 2.1
# we need at least version 3.0
if(NOT CAMITK_VER_MAJ)
set(CAMITK_VER_MAJ "2")
set(CAMITK_VER_MIN "1")
set(CAMITK_VER_MAJ "3")
set(CAMITK_VER_MIN "0")
endif()
# CamiTK short version name we are looking for
......
......@@ -27,6 +27,14 @@ $CAMITK_LICENCE_END$
// using cmake CONFIGURE_FILE feature (see CamiTKVersion.h.in and the file
// CMakeLists.txt in $CAMITKDIR)
/** @mainpage Core
*
* @section intro API documentation for CamiTK version @CAMITK_VERSION_STRING@
*
* @section name CamiTK stands for Computer Assited Medical Intervention Tool Kit.
*
* @section copyright (c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525
*/
namespace camitk
{
const char * Core::version = "@CAMITK_VERSION_STRING@";
......
......@@ -29,15 +29,6 @@ $CAMITK_LICENCE_END$
// -- Core stuff
#include "CamiTKAPI.h"
/** @mainpage Core
*
* @section intro API documentation for core library
*
* @section name Core stands for Computer Assited Medical Intervention Tool Kit.
*
* @section copyright (c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525
*/
namespace camitk
{
/**
......
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