Commit c62ae17a authored by Sylvain Thery's avatar Sylvain Thery

resolve cholmod usage bug

parent e442ce7f
......@@ -43,10 +43,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIC")
#SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}${BINARIES_RELATIVE_PATH})
IF (EXISTS ${CMAKE_SOURCE_DIR}/OpenNL/CMakeOptions.txt)
MESSAGE(INFO: "Using local options file: " ${CMAKE_SOURCE_DIR}/OpenNL/CMakeOptions.txt)
INCLUDE(${CMAKE_SOURCE_DIR}/OpenNL/CMakeOptions.txt)
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/OpenNL/CMakeOptions.txt)
IF (EXISTS ${CMAKE_SOURCE_DIR}/ThirdParty/OpenNL/CMakeOptions.txt)
MESSAGE(INFO: "Using local options file: " ${CMAKE_SOURCE_DIR}/ThirdParty/OpenNL/CMakeOptions.txt)
INCLUDE(${CMAKE_SOURCE_DIR}/ThirdParty/OpenNL/CMakeOptions.txt)
ENDIF()
IF(USE_CNC)
ADD_DEFINITIONS(-DNL_USE_CNC)
......
......@@ -44,14 +44,20 @@ IF(USE_CNC)
CUDA_ADD_CUBLAS_TO_TARGET(nl)
ELSE(USE_CNC)
IF(WIN32)
ADD_LIBRARY(nl ${SOURCES} ${HeaderFiles})
ADD_LIBRARY(nl ${SOURCES} ${HeaderFiles})
IF(USE_CHOLMOD)
TARGET_LINK_LIBRARIES(nl ${SUITESPARSE_LIBRARIES} ${CHOL_DEPS} ${CGoGN_ROOT_DIR}/windows_dependencies/lib/libf2c.lib)
ENDIF(USE_CHOLMOD)
# IF(USE_SUPERLU)
# TARGET_LINK_LIBRARIES(nl ${SUPERLU_LIBRARIES})
# ENDIF(USE_SUPERLU)
ELSE(WIN32)
ADD_LIBRARY(nl ${SOURCES} )
IF(USE_CHOLMOD)
TARGET_LINK_LIBRARIES(nl ${SUITESPARSE_LIBRARIES} ${CHOL_DEPS})
ENDIF(USE_CHOLMOD)
IF(USE_SUPERLU)
TARGET_LINK_LIBRARIES(nl ${SUPERLU_LIBRARIES})
ENDIF(USE_SUPERLU)
ADD_LIBRARY(nl ${SOURCES} )
IF(USE_CHOLMOD)
TARGET_LINK_LIBRARIES(nl ${SUITESPARSE_LIBRARIES} ${CHOL_DEPS})
ENDIF(USE_CHOLMOD)
IF(USE_SUPERLU)
TARGET_LINK_LIBRARIES(nl ${SUPERLU_LIBRARIES})
ENDIF(USE_SUPERLU)
ENDIF(WIN32)
ENDIF(USE_CNC)
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