From a6a88919cc71f6baa78f8bbc56de970ca9e9d992 Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Fri, 23 Jan 2015 16:13:05 +0100 Subject: [PATCH] OpenNL dylib compiling bug --- ThirdParty/OpenNL/src/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ThirdParty/OpenNL/src/CMakeLists.txt b/ThirdParty/OpenNL/src/CMakeLists.txt index 1d60e7c7..f0dbe726 100644 --- a/ThirdParty/OpenNL/src/CMakeLists.txt +++ b/ThirdParty/OpenNL/src/CMakeLists.txt @@ -25,6 +25,9 @@ IF(USE_SUPERLU) ENDIF(USE_SUPERLU) IF(USE_CHOLMOD) + IF (APPLE) + FIND_LIBRARY(CHOL_DEPS Accelerate) + ENDIF (APPLE) ADD_DEFINITIONS(-DNL_USE_CHOLMOD) INCLUDE_DIRECTORIES(${SUITESPARSE_INCLUDE_DIRS}) ENDIF(USE_CHOLMOD) @@ -41,8 +44,14 @@ IF(USE_CNC) CUDA_ADD_CUBLAS_TO_TARGET(nl) ELSE(USE_CNC) IF(WIN32) - ADD_LIBRARY(nl ${SOURCES} ${HeaderFiles}) + ADD_LIBRARY(nl ${SOURCES} ${HeaderFiles}) ELSE(WIN32) - ADD_LIBRARY(nl ${SOURCES} ) + 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) -- GitLab