Commit 3500c9b7 authored by Jan Möbius's avatar Jan Möbius

Fixed new search paths for vs2013

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19920 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0b065952
...@@ -23,7 +23,7 @@ if( WIN32 ) ...@@ -23,7 +23,7 @@ if( WIN32 )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif() endif()
...@@ -33,6 +33,7 @@ if( WIN32 ) ...@@ -33,6 +33,7 @@ if( WIN32 )
PATHS "C:\\libs\\win32\\SuiteSparse\\Include" PATHS "C:\\libs\\win32\\SuiteSparse\\Include"
"${VS_SEARCH_PATH}" "${VS_SEARCH_PATH}"
PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse
suitesparse-metis-for-windows-1.2.2-install/include/suitesparse
) )
# Add cholmod include directory to collection include directories # Add cholmod include directory to collection include directories
...@@ -46,7 +47,8 @@ if( WIN32 ) ...@@ -46,7 +47,8 @@ if( WIN32 )
NAMES amd.lib libamd.lib NAMES amd.lib libamd.lib
PATHS "C:\\libs\\win32\\SuiteSparse\\libs" PATHS "C:\\libs\\win32\\SuiteSparse\\libs"
"${VS_SEARCH_PATH}" "${VS_SEARCH_PATH}"
PATH_SUFFIXES suitesparse-4.2.1/lib64 ) PATH_SUFFIXES suitesparse-4.2.1/lib64
suitesparse-metis-for-windows-1.2.2-install/lib64 )
# 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 )
......
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