Commit 630c194e authored by Jan Möbius's avatar Jan Möbius
Browse files

Different naming scheme on windows with lib prefix

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@289 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent cc4bc578
...@@ -22,32 +22,32 @@ if (CBC_INCLUDE_DIR) ...@@ -22,32 +22,32 @@ if (CBC_INCLUDE_DIR)
set(CBC_LIBRARIES "${CBC_LIBRARY};${CBC_SOLVER_LIBRARY}" ) set(CBC_LIBRARIES "${CBC_LIBRARY};${CBC_SOLVER_LIBRARY}" )
else (CBC_INCLUDE_DIR) else (CBC_INCLUDE_DIR)
find_path(CBC_INCLUDE_DIR find_path(CBC_INCLUDE_DIR
NAMES CbcConfig.h NAMES CbcConfig.h
PATHS "$ENV{CBC_DIR}/include/coin" PATHS "$ENV{CBC_DIR}/include/coin"
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Cbc\\include" "${VS_SEARCH_PATH}CBC-2.9.4/Cbc/include"
) )
find_library( CBC_LIBRARY find_library( CBC_LIBRARY
NAMES Cbc NAMES Cbc libCbc
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Cbc\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
) )
find_library( CBC_SOLVER_LIBRARY find_library( CBC_SOLVER_LIBRARY
NAMES CbcSolver NAMES CbcSolver libCbcSolver
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Cbc\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
) )
set(CBC_INCLUDE_DIRS "${CBC_INCLUDE_DIR}" ) set(CBC_INCLUDE_DIRS "${CBC_INCLUDE_DIR}" )
......
...@@ -29,19 +29,18 @@ find_path(CGL_INCLUDE_DIR ...@@ -29,19 +29,18 @@ find_path(CGL_INCLUDE_DIR
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\cgl\\include" "C:\\libs\\cgl\\include"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Cgl\\include" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
) )
find_library( CGL_LIBRARY find_library( CGL_LIBRARY
NAMES Cgl NAMES Cgl libCgl
PATHS "$ENV{CGL_DIR}/lib" PATHS "$ENV{CGL_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\cgl\\lib" "C:\\libs\\cgl\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Cgl\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
) )
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" ) set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" )
......
...@@ -30,19 +30,18 @@ find_path(CLP_INCLUDE_DIR ...@@ -30,19 +30,18 @@ find_path(CLP_INCLUDE_DIR
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\clp\\include" "C:\\libs\\clp\\include"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Clp\\include" "${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
) )
find_library( CLP_LIBRARY find_library( CLP_LIBRARY
NAMES Clp NAMES Clp libClp
PATHS "$ENV{CLP_DIR}/lib" PATHS "$ENV{CLP_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\clp\\lib" "C:\\libs\\clp\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Clp\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
) )
set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" ) set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" )
......
...@@ -29,19 +29,18 @@ find_path(COINUTILS_INCLUDE_DIR ...@@ -29,19 +29,18 @@ find_path(COINUTILS_INCLUDE_DIR
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\coinutils\\include" "C:\\libs\\coinutils\\include"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\CoinUtils\\include" "${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/include"
) )
find_library( COINUTILS_LIBRARY find_library( COINUTILS_LIBRARY
NAMES CoinUtils NAMES CoinUtils libCoinUtils
PATHS "$ENV{COINUTILS_DIR}/lib" PATHS "$ENV{COINUTILS_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\coinutils\\lib" "C:\\libs\\coinutils\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\CoinUtils\\include" "${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/include"
) )
set(COINUTILS_INCLUDE_DIRS "${COINUTILS_INCLUDE_DIR}" ) set(COINUTILS_INCLUDE_DIRS "${COINUTILS_INCLUDE_DIR}" )
......
...@@ -30,43 +30,40 @@ find_path(OSI_INCLUDE_DIR ...@@ -30,43 +30,40 @@ find_path(OSI_INCLUDE_DIR
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\osi\\include" "C:\\libs\\osi\\include"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Osi\\include" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/include"
) )
find_library( OSI_LIBRARY find_library( OSI_LIBRARY
NAMES Osi NAMES Osi libOsi
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Osi\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_CBC_LIBRARY find_library( OSI_CBC_LIBRARY
NAMES OsiCbc NAMES OsiCbc libOsiCbc
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Osi\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_CLP_LIBRARY find_library( OSI_CLP_LIBRARY
NAMES OsiClp NAMES OsiClp libOsiClp
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}\\CBC-2.9.4\\Osi\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" ) set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" )
......
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