Commit 6e903ff0 authored by Jan Möbius's avatar Jan Möbius
Browse files

Updated CGAL Finder to look into integrated MacOS Dir on MacOs

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6479 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d33d9da8
......@@ -11,13 +11,24 @@ ENDIF (CGAL_INCLUDE_DIR)
GET_FILENAME_COMPONENT(module_file_path ${CMAKE_CURRENT_LIST_FILE} PATH )
# Look for the header file.
FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
PATHS ../../External/include
"C:/Program Files/CGAL-3.4/include"
"C:/Programme/CGAL-3.4/include"
"C:/libs/CGAL-3.4/include"
${module_file_path}/../../../External/include)
IF (NOT APPLE )
# Look for the header file.
FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
PATHS ../../External/include
"C:/Program Files/CGAL-3.4/include"
"C:/Programme/CGAL-3.4/include"
"C:/libs/CGAL-3.4/include"
${module_file_path}/../../../External/include)
ELSE( NOT APPLE)
# Look for the header file.
FIND_PATH(CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
PATHS "${CMAKE_SOURCE_DIR}/MacOS/Libs/CGAL-3.4/include"
)
ENDIF( NOT APPLE )
MARK_AS_ADVANCED(CGAL_INCLUDE_DIR)
......
......@@ -15,10 +15,20 @@ if (WIN32)
SuperLU
PATHS "C:\\libs\\SuperLU_3.0\\lib" )
ELSE(WIN32)
ELSEIF(APPLE)
find_path(SUPERLU_INCLUDE_DIR NAMES supermatrix.h
PATHS
/usr/include/superlu
PATHS "${CMAKE_SOURCE_DIR}/MacOS/Libs/SuperLU_3.0/SuperLU"
${SUPERLU_INCLUDE_PATH}
)
find_library( SUPERLU_LIBRARY
superlu
PATHS "${CMAKE_SOURCE_DIR}/MacOS/Libs/SuperLU_3.0/SuperLU")
ELSE( WIN32 )
find_path(SUPERLU_INCLUDE_DIR NAMES supermatrix.h
PATHS /usr/include/superlu
${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