Commit e9949e8b authored by David Bommes's avatar David Bommes
Browse files

corrected handling of libraries CoMISo depends on

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15991 383ad7c9-94d9-4d36-a494-682f7c89f535
parent e300f1f3
...@@ -9,13 +9,19 @@ ...@@ -9,13 +9,19 @@
# COMISO_OPT_DEPS - List of optional COMISO dependencies # COMISO_OPT_DEPS - List of optional COMISO dependencies
# #
if (COMISO_INCLUDE_DIR) #if (COMISO_INCLUDE_DIR)
# in cache already # # in cache already
set(COMISO_FOUND TRUE) # set(COMISO_FOUND TRUE)
SET( COMISO_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" ) # SET( COMISO_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" )
SET( COMISO_LIBRARY "CoMISo") # SET( COMISO_LIBRARY "CoMISo")
# add_definitions (-DCOMISODLL -DUSECOMISO )
# else (COMISO_INCLUDE_DIR)
IF (COMISO_INCLUDE_DIR)
# Already in cache, be silent
SET(COMISO_FIND_QUIETLY TRUE)
ENDIF (COMISO_INCLUDE_DIR)
else (COMISO_INCLUDE_DIR)
# Find CoMISo config file # Find CoMISo config file
FIND_PATH( COMISO_INCLUDE_DIR CoMISo/Config/config.hh FIND_PATH( COMISO_INCLUDE_DIR CoMISo/Config/config.hh
...@@ -221,13 +227,11 @@ IF (COMISO_INCLUDE_DIR) ...@@ -221,13 +227,11 @@ IF (COMISO_INCLUDE_DIR)
SET( COMISO_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" ) SET( COMISO_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" )
SET( COMISO_LIBRARY "CoMISo") SET( COMISO_LIBRARY "CoMISo")
# SET( COMISO_DEPS "GMM;BLAS;SUITESPARSE" ) # SET( COMISO_DEPS "GMM;BLAS;SUITESPARSE" )
SET( COMISO_DEPS "GMM" CACHE STRING "Comiso dependecies") SET( COMISO_DEPS "GMM")
SET( COMISO_OPT_DEPS ${COMISO_OPT_DEPS} CACHE STRING "Comiso optional dependecies") # SET( COMISO_OPT_DEPS ${COMISO_OPT_DEPS} CACHE STRING "Comiso optional dependecies")
mark_as_advanced(COMISO_DEPS COMISO_OPT_DEPS) # mark_as_advanced(COMISO_DEPS COMISO_OPT_DEPS)
ELSE (COMISO_INCLUDE_DIR) ELSE (COMISO_INCLUDE_DIR)
SET( COMISO_FOUND FALSE ) SET( COMISO_FOUND FALSE )
SET( COMISO_LIBRARY_DIR ) SET( COMISO_LIBRARY_DIR )
ENDIF (COMISO_INCLUDE_DIR) ENDIF (COMISO_INCLUDE_DIR)
endif (COMISO_INCLUDE_DIR)
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