Commit 3d1916aa authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed makefiles,when libraries are missing forexamples



git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@71 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent 2364b41a
...@@ -2,8 +2,20 @@ include (ACGCommon) ...@@ -2,8 +2,20 @@ include (ACGCommon)
find_package(CoMISo) find_package(CoMISo)
find_package(SUITESPARSE) find_package(SUITESPARSE)
find_package(MPI) find_package(MPI)
find_package (MUMPS)
find_package(IPOPT) find_package(IPOPT)
if (MUMPS_FOUND )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${MUMPS_INCLUDE_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${MUMPS_LIBRARY} )
endif ()
find_package (IPOPT)
if (IPOPT_FOUND AND MUMPS_FOUND)
list( APPEND COMISO_INCLUDE_DIRECTORIES ${IPOPT_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARY} )
endif ()
include_directories ( include_directories (
.. ..
...@@ -12,15 +24,14 @@ include_directories ( ...@@ -12,15 +24,14 @@ include_directories (
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR} ${COMISO_INCLUDE_DIR}
${SUITESPARSE_INCLUDE_DIRS} ${SUITESPARSE_INCLUDE_DIRS}
${MUMPS_INCLUDE_DIR} ${COMISO_INCLUDE_DIRECTORIES}
${IPOPT_INCLUDE_DIR}
) )
link_directories ( link_directories (
${SUITESPARSE_LIBRARY_DIRS} ${SUITESPARSE_LIBRARY_DIRS}
${TAO_LIBRARY_DIR} ${TAO_LIBRARY_DIR}
${PETSC_LIBRARY_DIR} ${PETSC_LIBRARY_DIR}
${IPOPT_HSL_LIBRARY_DIR} ${COMISO_LINK_DIRECTORIES}
) )
# source code directories # source code directories
...@@ -53,8 +64,7 @@ target_link_libraries (factored_solver ...@@ -53,8 +64,7 @@ target_link_libraries (factored_solver
${MPI_LIBRARY} ${MPI_LIBRARY}
${PETSC_LIBRARY} ${PETSC_LIBRARY}
${TAO_LIBRARY} ${TAO_LIBRARY}
${MUMPS_LIBRARY} ${COMISO_LINK_LIBRARIES}
${IPOPT_LIBRARY}
) )
if (APPLE) if (APPLE)
......
...@@ -2,8 +2,20 @@ include (ACGCommon) ...@@ -2,8 +2,20 @@ include (ACGCommon)
find_package(CoMISo) find_package(CoMISo)
find_package(SUITESPARSE) find_package(SUITESPARSE)
find_package(MPI) find_package(MPI)
find_package (MUMPS)
find_package(IPOPT) find_package(IPOPT)
if (MUMPS_FOUND )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${MUMPS_INCLUDE_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${MUMPS_LIBRARY} )
endif ()
find_package (IPOPT)
if (IPOPT_FOUND AND MUMPS_FOUND)
list( APPEND COMISO_INCLUDE_DIRECTORIES ${IPOPT_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARY} )
endif ()
include_directories ( include_directories (
.. ..
...@@ -12,15 +24,14 @@ include_directories ( ...@@ -12,15 +24,14 @@ include_directories (
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR} ${COMISO_INCLUDE_DIR}
${SUITESPARSE_INCLUDE_DIRS} ${SUITESPARSE_INCLUDE_DIRS}
${MUMPS_INCLUDE_DIR} ${COMISO_INCLUDE_DIRECTORIES}
${IPOPT_INCLUDE_DIR}
) )
link_directories ( link_directories (
${SUITESPARSE_LIBRARY_DIRS} ${SUITESPARSE_LIBRARY_DIRS}
${TAO_LIBRARY_DIR} ${TAO_LIBRARY_DIR}
${PETSC_LIBRARY_DIR} ${PETSC_LIBRARY_DIR}
${IPOPT_HSL_LIBRARY_DIR} ${COMISO_LINK_DIRECTORIES}
) )
# source code directories # source code directories
...@@ -53,8 +64,7 @@ target_link_libraries (quadratic_solver ...@@ -53,8 +64,7 @@ target_link_libraries (quadratic_solver
${MPI_LIBRARY} ${MPI_LIBRARY}
${PETSC_LIBRARY} ${PETSC_LIBRARY}
${TAO_LIBRARY} ${TAO_LIBRARY}
${MUMPS_LIBRARY} ${COMISO_LINK_LIBRARIES}
${IPOPT_LIBRARY}
) )
if (APPLE) if (APPLE)
......
...@@ -2,8 +2,20 @@ include (ACGCommon) ...@@ -2,8 +2,20 @@ include (ACGCommon)
find_package(CoMISo) find_package(CoMISo)
find_package(SUITESPARSE) find_package(SUITESPARSE)
find_package(MPI) find_package(MPI)
find_package (MUMPS)
find_package(IPOPT) find_package(IPOPT)
if (MUMPS_FOUND )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${MUMPS_INCLUDE_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${MUMPS_LIBRARY} )
endif ()
find_package (IPOPT)
if (IPOPT_FOUND AND MUMPS_FOUND)
list( APPEND COMISO_INCLUDE_DIRECTORIES ${IPOPT_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARY} )
endif ()
include_directories ( include_directories (
.. ..
...@@ -12,15 +24,14 @@ include_directories ( ...@@ -12,15 +24,14 @@ include_directories (
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR} ${COMISO_INCLUDE_DIR}
${SUITESPARSE_INCLUDE_DIRS} ${SUITESPARSE_INCLUDE_DIRS}
${MUMPS_INCLUDE_DIR} ${COMISO_INCLUDE_DIRECTORIES}
${IPOPT_INCLUDE_DIR}
) )
link_directories ( link_directories (
${SUITESPARSE_LIBRARY_DIRS} ${SUITESPARSE_LIBRARY_DIRS}
${TAO_LIBRARY_DIR} ${TAO_LIBRARY_DIR}
${PETSC_LIBRARY_DIR} ${PETSC_LIBRARY_DIR}
${IPOPT_HSL_LIBRARY_DIR} ${COMISO_LINK_DIRECTORIES}
) )
# source code directories # source code directories
...@@ -53,8 +64,7 @@ target_link_libraries (small_factored_solver ...@@ -53,8 +64,7 @@ target_link_libraries (small_factored_solver
${MPI_LIBRARY} ${MPI_LIBRARY}
${PETSC_LIBRARY} ${PETSC_LIBRARY}
${TAO_LIBRARY} ${TAO_LIBRARY}
${MUMPS_LIBRARY} ${COMISO_LINK_LIBRARIES}
${IPOPT_LIBRARY}
) )
if (APPLE) if (APPLE)
......
...@@ -2,8 +2,20 @@ include (ACGCommon) ...@@ -2,8 +2,20 @@ include (ACGCommon)
find_package(CoMISo) find_package(CoMISo)
find_package(SUITESPARSE) find_package(SUITESPARSE)
find_package(MPI) find_package(MPI)
find_package (MUMPS)
find_package(IPOPT) find_package(IPOPT)
if (MUMPS_FOUND )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${MUMPS_INCLUDE_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${MUMPS_LIBRARY} )
endif ()
find_package (IPOPT)
if (IPOPT_FOUND AND MUMPS_FOUND)
list( APPEND COMISO_INCLUDE_DIRECTORIES ${IPOPT_INCLUDE_DIR} )
list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIR} )
list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARY} )
endif ()
include_directories ( include_directories (
.. ..
...@@ -12,15 +24,14 @@ include_directories ( ...@@ -12,15 +24,14 @@ include_directories (
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${COMISO_INCLUDE_DIR} ${COMISO_INCLUDE_DIR}
${SUITESPARSE_INCLUDE_DIRS} ${SUITESPARSE_INCLUDE_DIRS}
${MUMPS_INCLUDE_DIR} ${COMISO_INCLUDE_DIRECTORIES}
${IPOPT_INCLUDE_DIR}
) )
link_directories ( link_directories (
${SUITESPARSE_LIBRARY_DIRS} ${SUITESPARSE_LIBRARY_DIRS}
${TAO_LIBRARY_DIR} ${TAO_LIBRARY_DIR}
${PETSC_LIBRARY_DIR} ${PETSC_LIBRARY_DIR}
${IPOPT_HSL_LIBRARY_DIR} ${COMISO_LINK_DIRECTORIES}
) )
# source code directories # source code directories
...@@ -53,8 +64,7 @@ target_link_libraries (small_quadratic_solver ...@@ -53,8 +64,7 @@ target_link_libraries (small_quadratic_solver
${MPI_LIBRARY} ${MPI_LIBRARY}
${PETSC_LIBRARY} ${PETSC_LIBRARY}
${TAO_LIBRARY} ${TAO_LIBRARY}
${MUMPS_LIBRARY} ${COMISO_LINK_LIBRARIES}
${IPOPT_LIBRARY}
) )
if (APPLE) if (APPLE)
......
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