From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 26 Mar 2010 08:37:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~24
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cd0879eeb29c1c5633cdcf2200b7e013a7b0286e;p=crea.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd6c35f..ab5e896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
 INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake NO_POLICY_SCOPE)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
+
 CREA_PREVENT_IN_SOURCE_BUILD()
 
 SET(USE_BOOST ON)
diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index b6935c2..c317f0b 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -322,15 +322,15 @@ IF(USE_XERCES)
 		  MESSAGE(FATAL_ERROR "XERCES_DIR not found")  
 		ELSE(NOT XERCES_LIB_DIR)
 		  
-		INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src )		
-		LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug )
+		INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )		
+		LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
 		  
 		ENDIF(NOT XERCES_LIB_DIR)   	
 		
 		IF(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D)
+			set(XERCES_LIBRARIES  xerces-c_3D)
 		ELSE(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3)
+			set(XERCES_LIBRARIES  xerces-c_3)
 		ENDIF(USE_DEBUG_LIB)
 		
 		MARK_AS_ADVANCED(XERCES_LIB_DIR)
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index b193712..6d123b1 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,6 +1,3 @@
-IF(WIN32)
-	SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea)
-ENDIF(WIN32)