modification for suitesparse under Visual

CMakeLists.txt

@@ -37,7 +37,6 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
-#find_package(SuiteSparse REQUIRED)
 
 IF (DEFINED ASSERTON)
 	add_definitions(-DCGOGN_ASSERT_BOOL=${ASSERTON})
@@ -91,10 +90,19 @@ SET (CGoGN_EXT_LIBS
 	${Boost_THREAD_LIBRARY}
 )
 
-IF(NOT WIN32)
+IF(WIN32)
+	SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
+	SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} 
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/suitesparse.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/metis.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/liblapack.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/libblas.lib		)
+ELSE(WIN32)
+	find_package(SuiteSparse REQUIRED)
 	SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
 	SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${SUITESPARSE_LIBRARIES})
-ENDIF(NOT WIN32)
+ENDIF(WIN32)
+
 
 #optionnal libs
 IF (WITH_ASSIMP)

apps_cmake.txt

@@ -32,7 +32,6 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
-find_package(SuiteSparse REQUIRED)
 
 IF (DEFINED ASSERTON)
 	add_definitions(-DCGOGN_ASSERT_BOOL=${ASSERTON})
@@ -62,9 +61,21 @@ SET (COMMON_LIBS
 	${Boost_SYSTEM_LIBRARY}
 	${Boost_REGEX_LIBRARY}
 	${Boost_THREAD_LIBRARY}
-	${SUITESPARSE_LIBRARIES}
 )
 
+IF(WIN32)
+	SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
+	SET (COMMON_LIBS ${COMMON_LIBS} 
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/suitesparse.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/metis.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/liblapack.lib
+		${CGoGN_ROOT_DIR}/windows_dependencies/lib/libblas.lib		)
+ELSE(WIN32)
+	find_package(SuiteSparse REQUIRED)
+	SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
+	SET (COMMON_LIBS ${COMMON_LIBS} ${SUITESPARSE_LIBRARIES})
+ENDIF(WIN32)
+
 #optionnal libs
 IF (WITH_ASSIMP)
 	add_definitions(-DWITH_ASSIMP)