X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=6ce195378a3332bd68a7a40a53ebddc1f840f682;hb=HEAD;hp=f43a315775ebf27e76eee430e7f67da5a0e81ff0;hpb=a5d13595e8b697490856c32fc6c5877ee7673fad;p=creaContours.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f43a315..6ce1953 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,
@@ -18,9 +43,22 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_
 
 PROJECT(creaContours)
 
+#-----------------------------------------------------------------------------
+# 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)
+#-----------------------------------------------------------------------------
+
 SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 4)
+SET(PROJECT_MINOR_VERSION 3)
+SET(PROJECT_BUILD_VERSION 0)
 
 #==================================
 
@@ -77,9 +115,19 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
   
+#IF(WIN32)
+#    INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+#    LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+#ENDIF(WIN32)
+
 IF(WIN32)
-    INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-    LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
+   set (SQLITE_DIR $ENV{SQLITE_DIR})
+   IF(DEFINED SQLITE_DIR)
+     INCLUDE_DIRECTORIES(${SQLITE_DIR}/include)
+     LINK_DIRECTORIES(${SQLITE_DIR}/lib)
+   ELSE()
+      MESSAGE(FATAL_ERROR "System variable SQLITE_DIR not defined")
+   ENDIF()
 ENDIF(WIN32)