Commit 50bc4a32 authored by Jan Möbius's avatar Jan Möbius

Updated finders to follow comiso and igm

parent 2317b29e
...@@ -16,12 +16,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) ...@@ -16,12 +16,7 @@ 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()
if (CGL_INCLUDE_DIR) if ( NOT CGL_FOUND)
# in cache already
set(CGL_FOUND TRUE)
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" )
set(CGL_LIBRARIES "${CGL_LIBRARY}" )
else (CGL_INCLUDE_DIR)
find_path(CGL_INCLUDE_DIR find_path(CGL_INCLUDE_DIR
NAMES CglConfig.h NAMES CglConfig.h
...@@ -73,4 +68,4 @@ find_package_handle_standard_args(CGL DEFAULT_MSG ...@@ -73,4 +68,4 @@ find_package_handle_standard_args(CGL DEFAULT_MSG
mark_as_advanced(CGL_INCLUDE_DIR CGL_LIBRARY) mark_as_advanced(CGL_INCLUDE_DIR CGL_LIBRARY)
endif(CGL_INCLUDE_DIR) endif(NOT CGL_FOUND)
...@@ -17,12 +17,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) ...@@ -17,12 +17,7 @@ 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()
if (CLP_INCLUDE_DIR) if (NOT CLP_FOUND)
# in cache already
set(CLP_FOUND TRUE)
set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" )
set(CLP_LIBRARIES "${CLP_LIBRARY}" )
else (CLP_INCLUDE_DIR)
find_path(CLP_INCLUDE_DIR find_path(CLP_INCLUDE_DIR
NAMES ClpConfig.h NAMES ClpConfig.h
...@@ -74,4 +69,4 @@ find_package_handle_standard_args(CLP DEFAULT_MSG ...@@ -74,4 +69,4 @@ find_package_handle_standard_args(CLP DEFAULT_MSG
mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY) mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY)
endif(CLP_INCLUDE_DIR) endif(CLP_FOUND)
...@@ -15,12 +15,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) ...@@ -15,12 +15,7 @@ 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()
if (COINUTILS_INCLUDE_DIR) if ( NOT COINUTILS_FOUND )
# in cache already
set(COINUTILS_FOUND TRUE)
set(COINUTILS_INCLUDE_DIRS "${COINUTILS_INCLUDE_DIR}" )
set(COINUTILS_LIBRARIES "${COINUTILS_LIBRARY}" )
else (COINUTILS_INCLUDE_DIR)
find_path(COINUTILS_INCLUDE_DIR find_path(COINUTILS_INCLUDE_DIR
NAMES CoinUtilsConfig.h NAMES CoinUtilsConfig.h
...@@ -73,4 +68,4 @@ find_package_handle_standard_args(COINUTILS DEFAULT_MSG ...@@ -73,4 +68,4 @@ find_package_handle_standard_args(COINUTILS DEFAULT_MSG
mark_as_advanced(COINUTILS_INCLUDE_DIR COINUTILS_LIBRARY) mark_as_advanced(COINUTILS_INCLUDE_DIR COINUTILS_LIBRARY)
endif(COINUTILS_INCLUDE_DIR) endif(NOT COINUTILS_FOUND)
...@@ -17,12 +17,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) ...@@ -17,12 +17,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
endif() endif()
if (OSI_INCLUDE_DIR) if (NOT OSI_FOUND )
# in cache already
set(OSI_FOUND TRUE)
set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" )
set(OSI_LIBRARIES "${OSI_LIBRARY};${OSI_CBC_LIBRARY};${OSI_CLP_LIBRARY}" )
else (OSI_INCLUDE_DIR)
find_path(OSI_INCLUDE_DIR find_path(OSI_INCLUDE_DIR
NAMES OsiConfig.h NAMES OsiConfig.h
...@@ -120,7 +115,7 @@ select_library_configurations( OSI_CLP ) ...@@ -120,7 +115,7 @@ select_library_configurations( OSI_CLP )
set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" ) set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" )
set(OSI_LIBRARIES "${OSI_LIBRARY};${OSI_CBC_LIBRARY};${OSI_CLP_LIBRARY}" ) set(OSI_LIBRARIES "${OSI_LIBRARIES};${OSI_CBC_LIBRARIES};${OSI_CLP_LIBRARIES}" )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
...@@ -129,6 +124,6 @@ include(FindPackageHandleStandardArgs) ...@@ -129,6 +124,6 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OSI DEFAULT_MSG find_package_handle_standard_args(OSI DEFAULT_MSG
OSI_LIBRARY OSI_CBC_LIBRARY OSI_CLP_LIBRARY OSI_INCLUDE_DIR) OSI_LIBRARY OSI_CBC_LIBRARY OSI_CLP_LIBRARY OSI_INCLUDE_DIR)
mark_as_advanced(OSI_INCLUDE_DIR OSI_LIBRARY OSI_CBC_LIBRARY OSI_CLP_LIBRARY) mark_as_advanced(OSI_INCLUDE_DIR OSI_LIBRARY OSI_CBC_LIBRARY OSI_CLP_LIBRARY OSI_LIBRARIES)
endif(OSI_INCLUDE_DIR) endif(NOT OSI_FOUND)
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