Commit 217ac3de authored by Jan Möbius's avatar Jan Möbius

Updated global cmake finders for building MIQ with windows setup

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12569 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 157bbab2
...@@ -16,13 +16,16 @@ IF (NOT APPLE ) ...@@ -16,13 +16,16 @@ IF (NOT APPLE )
FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
PATHS ../../External/include PATHS ../../External/include
"C:/libs/CGAL-3.6/include" "C:/libs/CGAL-3.6/include"
"C:/Program Files/CGAL-3.5/include" "C:/Program Files/CGAL-3.5/include"
"C:/Programme/CGAL-3.5/include" "C:/Programme/CGAL-3.5/include"
"C:/libs/CGAL-3.5/include" "C:/libs/CGAL-3.5/include"
"C:/Program Files/CGAL-3.4/include" "C:/Program Files/CGAL-3.4/include"
"C:/Programme/CGAL-3.4/include" "C:/Programme/CGAL-3.4/include"
"C:/libs/CGAL-3.4/include" "C:/libs/CGAL-3.4/include"
${module_file_path}/../../../External/include) "C:/Programme/CGAL-3.9/include"
"C:/Program Files/CGAL-3.9/include"
"C:/Program Files (x86)/CGAL-3.9/include"
${module_file_path}/../../../External/include)
ELSE( NOT APPLE) ELSE( NOT APPLE)
# Look for the header file. # Look for the header file.
FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
......
...@@ -16,9 +16,10 @@ FIND_PATH(Eigen3_INCLUDE_DIR NAMES Eigen/Dense ...@@ -16,9 +16,10 @@ FIND_PATH(Eigen3_INCLUDE_DIR NAMES Eigen/Dense
PATHS /usr/include/eigen3 PATHS /usr/include/eigen3
/usr/local/include /usr/local/include
"c:\\libs\\eigen3\\include" "c:\\libs\\eigen3\\include"
${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include "c:\\libs\\eigen\\include"
../../External/include ${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include
${module_file_path}/../../../External/include) ../../External/include
${module_file_path}/../../../External/include)
# Copy the results to the output variables. # Copy the results to the output variables.
......
...@@ -15,6 +15,10 @@ if (GMP_INCLUDE_DIR AND GMP_LIBRARY_DIR ) ...@@ -15,6 +15,10 @@ if (GMP_INCLUDE_DIR AND GMP_LIBRARY_DIR )
set(GMP_FOUND TRUE) set(GMP_FOUND TRUE)
if ( WIN32 )
list ( APPEND GMP_LIBRARIES libgmp-10.lib;libmpfr-4.lib )
endif()
else() else()
find_package(CGAL) find_package(CGAL)
if (NOT CGAL_FOUND) if (NOT CGAL_FOUND)
...@@ -32,15 +36,16 @@ else() ...@@ -32,15 +36,16 @@ else()
endif() endif()
if ( CGAL_AUTO_LINK_ENABLED ) if ( CGAL_AUTO_LINK_ENABLED )
find_path(GMP_LIBRARY_DIR find_path(GMP_LIBRARY_DIR
NAMES "gmp-${CGAL_TOOLSET}-mt.lib" "gmp-${CGAL_TOOLSET}-mt-gd.lib" NAMES "gmp-${CGAL_TOOLSET}-mt.lib" "gmp-${CGAL_TOOLSET}-mt-gd.lib" libgmp-10.lib
PATHS "${CGAL_INCLUDE_DIR}/../auxiliary/gmp/lib" PATHS "${CGAL_INCLUDE_DIR}/../auxiliary/gmp/lib"
DOC "Directory containing the GMP library" DOC "Directory containing the GMP library"
) )
if ( WIN32 )
list ( APPEND GMP_LIBRARIES libgmp-10.lib;libmpfr-4.lib )
endif()
else() else()
find_library(GMP_LIBRARIES NAMES gmp find_library(GMP_LIBRARIES NAMES gmp
PATHS ENV GMP_LIB_DIR PATHS ENV GMP_LIB_DIR
DOC "Path to the GMP library" DOC "Path to the GMP library"
......
...@@ -4,8 +4,7 @@ if (GUROBI_INCLUDE_DIR) ...@@ -4,8 +4,7 @@ if (GUROBI_INCLUDE_DIR)
else (GUROBI_INCLUDE_DIR) else (GUROBI_INCLUDE_DIR)
if (WIN32) if (WIN32)
find_path(GUROBI_INCLUDE_DIR NAMES gurobi_c++.h find_path(GUROBI_INCLUDE_DIR NAMES SRC/gurobi_c++.h
PREFIXES SRC
PATHS PATHS
"C:\\libs\\gurobi45" "C:\\libs\\gurobi45"
${GUROBI_INCLUDE_PATH} ${GUROBI_INCLUDE_PATH}
......
...@@ -34,7 +34,7 @@ if( WIN32 ) ...@@ -34,7 +34,7 @@ if( WIN32 )
# if we found the library, add it to the defined libraries # if we found the library, add it to the defined libraries
IF ( SUITESPARSE_LIBRARY_DIRS ) IF ( SUITESPARSE_LIBRARY_DIRS )
list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;libf2c;optimized;lapack;debug;blasd;debug;libf2cd;debug;lapackd ) list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;lapack;debug;blasd;debug;lapackd )
ENDIF( SUITESPARSE_LIBRARY_DIRS ) ENDIF( SUITESPARSE_LIBRARY_DIRS )
else( WIN32 ) else( WIN32 )
......
...@@ -4,8 +4,8 @@ if (SUPERLU_INCLUDE_DIR) ...@@ -4,8 +4,8 @@ if (SUPERLU_INCLUDE_DIR)
else (SUPERLU_INCLUDE_DIR) else (SUPERLU_INCLUDE_DIR)
if (WIN32) if (WIN32)
find_path(SUPERLU_INCLUDE_DIR NAMES supermatrix.h
PREFIXES SRC find_path(SUPERLU_INCLUDE_DIR NAMES SRC/supermatrix.h
PATHS PATHS
"C:\\libs\\SuperLU_3.0" "C:\\libs\\SuperLU_3.0"
${SUPERLU_INCLUDE_PATH} ${SUPERLU_INCLUDE_PATH}
......
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