diff --git a/finders/FindCoinUtils.cmake b/finders/FindCoinUtils.cmake index f8962d6258a287e407da4948885980bd8ac198d0..05a758d836163954774c86994e67bfb944a98e73 100644 --- a/finders/FindCoinUtils.cmake +++ b/finders/FindCoinUtils.cmake @@ -1,44 +1,42 @@ # Try to find Coin-ORs CoinUtils: https://www.coin-or.org/ # On success, this will define the target Coin::CoinUtils if (NOT TARGET Coin::CoinUtils) + find_path(CoinUtils_INCLUDE_DIR - NAMES CoinPragma.hpp - PATHS "$ENV{CoinUtils_DIR}/include/coin" - "/opt/homebrew/include/coinutils/coin" #homebrew default path - "/usr/local/include/coinutils/coin" #homebrew default path - "/usr/local/include/coin-or" - "/usr/include/coinutils" - "/usr/include/coin-or" - "/usr/include/coin" - "/usr/lib/coin-or" - "C:\\libs\\coinutils\\include" - ) + NAMES CoinPragma.hpp + PATHS "$ENV{CoinUtils_DIR}/include/coin" + "/opt/homebrew/include/coinutils/coin" #homebrew default path + "/usr/local/include/coinutils/coin" #homebrew default path + "/usr/local/include/coin-or" + "/usr/include/coinutils" + "/usr/include/coin-or" + "/usr/include/coin" + "/usr/lib/coin-or" + "C:\\libs\\coinutils\\include" + ) find_library( CoinUtils_LIBRARY NAMES CoinUtils - PATHS "$ENV{CoinUtils_DIR}/lib" - "/opt/homebrew/lib" # homebrew default path - "/usr/local/lib" # homebrew default path - "/usr/local/lib/coin-or" - "/usr/local/lib/coin" - "/usr/lib/coin-or" - "/usr/lib/coin" - "/usr/lib" - "C:\\libs\\clp\\lib" - ) - -set(CoinUtils_INCLUDE_DIRS "${CoinUtils_INCLUDE_DIR}" ) -set(CoinUtils_LIBRARIES "${CoinUtils_LIBRARY}" ) + PATHS "$ENV{CoinUtils_DIR}/lib" + "/opt/homebrew/lib" # homebrew default path + "/usr/local/lib" # homebrew default path + "/usr/local/lib/coin-or" + "/usr/local/lib/coin" + "/usr/lib/coin-or" + "/usr/lib/coin" + "/usr/lib" + ) -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(CoinUtils DEFAULT_MSG CoinUtils_LIBRARY CoinUtils_INCLUDE_DIR) +mark_as_advanced(CoinUtils_INCLUDE_DIR CoinUtils_LIBRARY) if(CoinUtils_FOUND) add_library(Coin::CoinUtils SHARED IMPORTED) set_property(TARGET Coin::CoinUtils PROPERTY IMPORTED_LOCATION ${CoinUtils_LIBRARY}) target_include_directories(Coin::CoinUtils INTERFACE ${CoinUtils_INCLUDE_DIR}) + set(CoinUtils_LIBRARIES "Coin::CoinUtils" ) endif() +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(CoinUtils DEFAULT_MSG CoinUtils_LIBRARIES) -mark_as_advanced(CoinUtils_INCLUDE_DIR CoinUtils_LIBRARY) endif (NOT TARGET Coin::CoinUtils) diff --git a/finders/FindLPSolve.cmake b/finders/FindLPSolve.cmake index 131c02fbf973acdd704f592bb419b527d51d1fbd..d9894242fd0e0cf877d6c0341aa59a0101aea574 100644 --- a/finders/FindLPSolve.cmake +++ b/finders/FindLPSolve.cmake @@ -1,3 +1,4 @@ +# Look for lp_solve: https://lpsolve.sourceforge.net/5.5/index.htm if(NOT TARGET lpsolve::lpsolve) set(LPSOLVE_DIR $ENV{LPSOLVE_DIR} CACHE PATH "lpsolve directory (contain include/lp_lib.h).") @@ -24,7 +25,7 @@ find_library(LPSOLVE_LIBRARY get_filename_component(LPSOLVE_LIBRARY_DIR ${LPSOLVE_LIBRARY} DIRECTORY CACHE) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LPSOLVE DEFAULT_MSG LPSOLVE_INCLUDE_DIR LPSOLVE_LIBRARY LPSOLVE_LIBRARY_DIR) +find_package_handle_standard_args(LPSolve DEFAULT_MSG LPSOLVE_INCLUDE_DIR LPSOLVE_LIBRARY LPSOLVE_LIBRARY_DIR) if(LPSOLVE_FOUND AND NOT TARGET lpsolve::lpsolve) add_library(lpsolve::lpsolve INTERFACE IMPORTED)