Commit 6b1a8096 authored by David Bommes's avatar David Bommes

changes on build system

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@221 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent cc817c43
......@@ -51,15 +51,18 @@ else()
endif ()
# We require cgal with its blas on windows
if (WIN32)
find_package(CGAL)
if (CGAL_FOUND)
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CGAL_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${CGAL_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${CGAL_LIBRARIES} )
endif()
if (CGAL_FOUND)
set (COMISO_CGAL_CONFIG_FILE_SETTINGS "#define COMISO_CGAL_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CGAL_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${CGAL_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${CGAL_LIBRARIES} )
else()
set (COMISO_CGAL_CONFIG_FILE_SETTINGS "#define COMISO_CGAL_AVAILABLE 0" )
message (STATUS "CGAL not found!")
endif()
find_package (BLAS)
if (BLAS_FOUND )
set (COMISO_BLAS_CONFIG_FILE_SETTINGS "#define COMISO_BLAS_AVAILABLE 1" )
......@@ -69,7 +72,7 @@ if (BLAS_FOUND )
list( APPEND COMISO_LINK_LIBRARIES ${BLAS_LIBRARIES} )
else()
set (COMISO_BLAS_CONFIG_FILE_SETTINGS "#define COMISO_BLAS_AVAILABLE 0" )
message (FATAL_ERROR "BLAS not found!")
message (STATUS "BLAS not found!")
endif ()
find_package (ADOLC)
......@@ -222,8 +225,6 @@ find_package (CPLEX)
if (CPLEX_FOUND )
set (COMISO_CPLEX_CONFIG_FILE_SETTINGS "#define COMISO_CPLEX_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CPLEX_INCLUDE_DIRS} )
# list( APPEND COMISO_LINK_DIRECTORIES ${CPLEX_LIBRARY_DIR} )
# list( APPEND COMISO_LINK_DIRECTORIES ${CPLEX_CONCERT_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${CPLEX_LIBRARIES} )
#enable c++ support
......
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