X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=f15ef8ec492e010fbec5a5e18d1d1d97b25ed615;hb=09af6d2aae8a65b176d1a7f00cd7346a4053309e;hp=11f38c8b0bb96bbc47cd96e94f31734d89719c7f;hpb=3616e88aaaa63e29421d4a6221cc97df599f9ff6;p=crea_ThirdParty_dlls.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11f38c8..f15ef8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,53 +1,11 @@
 PROJECT(crea_ThirdParty_dlls)
 
-SET(PROJECT_MAJOR_VERSION 1)
+cmake_minimum_required(VERSION 2.6)
+
+SET(PROJECT_MAJOR_VERSION 3)
 SET(PROJECT_MINOR_VERSION 0)
 SET(PROJECT_BUILD_VERSION 0)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
-OPTION(USE_CREATHIRDPARTYDLL_V1 ON)
-
-IF(USE_CREATHIRDPARTYDLL_V1)
-	FIND_PACKAGE(crea REQUIRED)
-	IF (crea_FOUND)
-	  INCLUDE(${crea_USE_FILE})
-	ENDIF(crea_FOUND)
-
-	SET(USE_GDCM ON)
-	SET(USE_GDCM_VTK ON)
-	SET(USE_WXWIDGETS ON)
-	SET(USE_VTK ON)
-	SET(USE_ITK ON)
-	SET(USE_BOOST ON)
-	SET(USE_QT4 ON)
-
-	CREA_FIND_AND_USE_LIBRARIES()
-
-	SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-	SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-	MARK_AS_ADVANCED(
-	  CMAKE_BACKWARDS_COMPATIBILITY
-	  EXECUTABLE_OUTPUT_PATH 
-	  LIBRARY_OUTPUT_PATH
-	  )
-
-	# Includes 
-	INCLUDE_DIRECTORIES(
-	#  ${PROJECT_BINARY_DIR}
-	  ${PROJECT_SOURCE_DIR}/src
-	  )
-
-	IF(WIN32)
-	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-	LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
-	ENDIF(WIN32)
-
-	#SUBDIRS(src)
-	#SUBDIRS(appli)
-	#SUBDIRS(bbtk)
-	SUBDIRS(install)
-ELSE(USE_CREATHIRDPARTYDLL_V1)
-	SUBDIRS(install2)
-ENDIF(USE_CREATHIRDPARTYDLL_V1)
-
+SUBDIRS(install)