]> Creatis software - crea.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 26 Mar 2010 08:37:05 +0000 (08:37 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 26 Mar 2010 08:37:05 +0000 (08:37 +0000)
CMakeLists.txt
cmake/CREAMacro_FindAndUseLibraries.cmake
install/CMakeLists.txt

index dd6c35fef7c6eb9ff11354c537eaf213fc899997..ab5e89633c06b9b89600a3cd6289edd46dd34542 100644 (file)
@@ -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)
index b6935c28d3f12416099c405e0a8ea2bccde63149..c317f0bf5e3225f98c683b2cefb542dfd54a0d2d 100644 (file)
@@ -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)
index b193712c351e49bae51da8d72bb756abefef841b..6d123b1315c8ceb8dc8f0ecc5685af0358c21ef9 100644 (file)
@@ -1,6 +1,3 @@
-IF(WIN32)
-       SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea)
-ENDIF(WIN32)