X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=f10e99ccc4a1014cb517563ae6b5fc7db99df6ae;hb=HEAD;hp=ba06192b0cb6face6f3999176569655fe5062e71;hpb=6a1cb1e499e632bf795ce75a88dd0340f79a37bd;p=creaMiniTools.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba06192..f10e99c 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.
+# ------------------------------------------------------------------------ */
+
 # ---------------------------------
 #
 # Unless you are an experimented cmake user,
@@ -24,10 +49,23 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_
 PROJECT( creaMiniTools )
 ###################################
 
+#-----------------------------------------------------------------------------
+# Configure Dart testing support.  This should be done before any
+# MESSAGE(FATAL_ERROR ...) commands are invoked.
+IF(INCLUDE_CTEST)
+  INCLUDE(CTest)
+  ENABLE_TESTING()
+ENDIF(INCLUDE_CTEST)
+IF(BUILD_TESTING)
+  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+  MARK_AS_ADVANCED(BUILDNAME)
+ENDIF(BUILD_TESTING)
+#-----------------------------------------------------------------------------
+
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_MINOR_VERSION 1)
 SET(PROJECT_BUILD_VERSION 0)
 
 SET(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_BUILD_VERSION}")
@@ -67,7 +105,7 @@ SET(USE_CREA      OFF)
 SET(USE_GDCM      OFF)
 SET(USE_GDCM_VTK  OFF)
 SET(USE_GDCM2     OFF)
-SET(USE_WXWIDGETS OFF)
+SET(USE_WXWIDGETS ON)
 SET(USE_KWWIDGETS OFF)
 SET(USE_VTK       OFF)
 SET(USE_ITK       OFF)
@@ -140,6 +178,7 @@ ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(install)
 
 ADD_SUBDIRECTORY(bbtk_package_creaMiniTools)
+ADD_SUBDIRECTORY(bbtk_package_creaMiniToolsBase)
 
 
 #==================================