X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=7f896a63b672ef4f315147d452b7bbac7957f9e7;hb=3d8f194f91b97f9fa8cc3b5a78a1d297f83fc107;hp=3f2f6cfa66b7a6d6c6b7acebca83197afe3f1e7a;hpb=8185e042f64574ca43bba733ec2158a2aa994220;p=creaMaracasVisu.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f2f6cf..7f896a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,28 @@ +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + # # Test CMake version # @@ -14,8 +39,8 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_ PROJECT(creaMaracasVisu) SET(PROJECT_MAJOR_VERSION 1) -SET(PROJECT_MINOR_VERSION 0) -SET(PROJECT_BUILD_VERSION 3) +SET(PROJECT_MINOR_VERSION 1) +SET(PROJECT_BUILD_VERSION 0) #================================== @@ -102,7 +127,8 @@ INCLUDE_DIRECTORIES( #JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere -INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/) +INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/gtk-2.0/include/) +LINK_DIRECTORIES(/usr/lib/x86_64-linux-gnu/) #JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere ADD_SUBDIRECTORY(install)