From df3e54eb4a6b001b7f0560a2da73a5bd7f18615e Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Tue, 1 May 2012 18:22:51 -0700 Subject: [PATCH] Fix link order of CHOLMOD This was working by accident due to dynamic linking. Fixes issue #2. --- internal/ceres/CMakeLists.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt index 8c4023ef7..16016665f 100644 --- a/internal/ceres/CMakeLists.txt +++ b/internal/ceres/CMakeLists.txt @@ -103,16 +103,15 @@ ADD_LIBRARY(ceres ${CERES_INTERNAL_HDRS} ${CERES_INTERNAL_SCHUR_FILES}) -# TODO(keir): Make linking gomp optional for e.g. Windows. SET(CERES_LIBRARY_DEPENDENCIES - ${GLOG_LIB} - ${GFLAGS_LIB} - ${LAPACK_LIB} - ${CAMD_LIB} - ${AMD_LIB} - ${CCOLAMD_LIB} - ${COLAMD_LIB} - ${CHOLMOD_LIB}) + ${GLOG_LIB} + ${GFLAGS_LIB} + ${CHOLMOD_LIB} + ${LAPACK_LIB} + ${CAMD_LIB} + ${AMD_LIB} + ${CCOLAMD_LIB} + ${COLAMD_LIB}) IF (EXISTS ${METIS_LIB}) SET(CERES_LIBRARY_DEPENDENCIES