Commit 9526242e authored by Sylvain Thery's avatar Sylvain Thery

windows compile

parent fdcfe31d
...@@ -8,6 +8,7 @@ ENDIF () ...@@ -8,6 +8,7 @@ ENDIF ()
IF (WIN32) IF (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName}) link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName})
link_directories( ${CGoGN_ROOT_DIR}/windows_dependencies/lib/)
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ELSE() ELSE()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
......
...@@ -52,6 +52,11 @@ ENDIF() ...@@ -52,6 +52,11 @@ ENDIF()
# #
# External Libraries (not included a third party libraries) # External Libraries (not included a third party libraries)
# #
IF(WIN32)
SET ( CMAKE_PREFIX_PATH ${CGoGN_ROOT_DIR}/windows_dependencies CACHE STRING "path to dependencies" )
ENDIF(WIN32)
FIND_PACKAGE(OpenGL REQUIRED) FIND_PACKAGE(OpenGL REQUIRED)
FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(GLEW REQUIRED) FIND_PACKAGE(GLEW REQUIRED)
...@@ -66,6 +71,14 @@ ELSE () ...@@ -66,6 +71,14 @@ ELSE ()
ENDIF() ENDIF()
IF (NOT WIN32) IF (NOT WIN32)
FIND_PACKAGE(SuiteSparse REQUIRED) FIND_PACKAGE(SuiteSparse REQUIRED)
ELSE()
set(SuiteSparse_SUITESPARSECONFIG_INCLUDE_DIR ${CGoGN_ROOT_DIR}/windows_dependencies/include)
set(SuiteSparse_USE_LAPACK_BLAS ON)
find_package(SuiteSparse QUIET NO_MODULE)
if(NOT SuiteSparse_FOUND)
set(SuiteSparse_VERBOSE ON)
find_package(SuiteSparse REQUIRED) # 2nd: Use FindSuiteSparse.cmake module
endif()
ENDIF() ENDIF()
# #
...@@ -140,7 +153,7 @@ ENDIF () ...@@ -140,7 +153,7 @@ ENDIF ()
ADD_SUBDIRECTORY(ThirdParty/TinyXml2) ADD_SUBDIRECTORY(ThirdParty/TinyXml2)
INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2) INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2)
IF (CGoGN_WITH_QT) IF (CGoGN_WITH_QT AND (NOT WIN32))
ADD_SUBDIRECTORY(ThirdParty/libQGLViewer/QGLViewer) ADD_SUBDIRECTORY(ThirdParty/libQGLViewer/QGLViewer)
INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/ThirdParty/libQGLViewer/) INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/ThirdParty/libQGLViewer/)
ENDIF() ENDIF()
...@@ -193,10 +206,10 @@ LIST(INSERT CGoGN_EXT_INCLUDES 0 ...@@ -193,10 +206,10 @@ LIST(INSERT CGoGN_EXT_INCLUDES 0
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
${SuiteSparse_INCLUDE_DIRS}
) )
# define libs for external libs # define libs for external libs
IF (CGoGN_WITH_ASSIMP) IF (CGoGN_WITH_ASSIMP)
LIST(APPEND CGoGN_EXT_LIBS assimp) LIST(APPEND CGoGN_EXT_LIBS assimp)
ENDIF () ENDIF ()
...@@ -211,25 +224,12 @@ LIST(APPEND CGoGN_EXT_LIBS ...@@ -211,25 +224,12 @@ LIST(APPEND CGoGN_EXT_LIBS
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${SuiteSparse_LIBRARIES}
) )
# W32 specific libraries and includes IF(NOT WIN32)
IF(WIN32) LIST(APPEND CGoGN_EXT_LIBS pthread) #for c++11 thread
INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/) ENDIF()
INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
LIST(APPEND CGoGN_EXT_INCLUDES ${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
LIST(APPEND 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)
LIST(APPEND CGoGN_EXT_INCLUDES ${SUITESPARSE_INCLUDE_DIRS})
LIST(APPEND CGoGN_EXT_LIBS ${SUITESPARSE_LIBRARIES} pthread)
ENDIF(WIN32)
#LIST(REMOVE_DUPLICATES CGoGN_EXT_INCLUDES)
include_directories( include_directories(
${CGoGN_SRC_DIR}/include ${CGoGN_SRC_DIR}/include
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment