Commit 683ad21b authored by Niccolò Iardella's avatar Niccolò Iardella

Remove custom settings

parent f47b54d8
...@@ -9,17 +9,16 @@ ...@@ -9,17 +9,16 @@
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.8)
project(NDOSolver_FiOracle VERSION 4.0 LANGUAGES CXX) project(NDOSolver_FiOracle VERSION 4.0 LANGUAGES CXX)
# ----- Requirements -------------------------------------------------------- # # ----- Settings ------------------------------------------------------------ #
# find_package() is used to find libraries and automatically configure them. #set(COIN_INC "")
# It requires either a package configuration module (***Config.cmake) or a #set(COIN_LIB "")
# find module (Find***.cmake), usually provided by libraries. #set(OSI_INC "")
#set(OSI_LIB "")
# We can provide a settings file with -DSETTINGS="filename" #set(CLP_INC "")
if ((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) AND SETTINGS) #set(CLP_LIB "")
message(STATUS "Using CMake custom settings in ${SETTINGS}") #set(CPLEX_STUDIO_DIR "")
include(${SETTINGS} OPTIONAL)
endif ()
# ----- Requirements -------------------------------------------------------- #
# This is to use the find modules we provide # This is to use the find modules we provide
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
...@@ -166,8 +165,7 @@ install(FILES ...@@ -166,8 +165,7 @@ install(FILES
# This is needed so other projects can find the library in a local build. # This is needed so other projects can find the library in a local build.
# It does not affect installation. # It does not affect installation.
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_EXPORT_PACKAGE_REGISTRY)
set(CMAKE_EXPORT_PACKAGE_REGISTRY ON)
export(EXPORT NDOFiOracle-targets export(EXPORT NDOFiOracle-targets
FILE ${CMAKE_CURRENT_BINARY_DIR}/NDOFiOracleTargets.cmake FILE ${CMAKE_CURRENT_BINARY_DIR}/NDOFiOracleTargets.cmake
......
set(CMAKE_BUILD_TYPE "Debug")
set(BUILD_SHARED_LIBS ON)
#set(COIN_INC "")
#set(COIN_LIB "")
#set(OSI_INC "")
#set(OSI_LIB "")
#set(CLP_INC "")
#set(CLP_LIB "")
#set(CPLEX_STUDIO_DIR "")
...@@ -181,7 +181,7 @@ if (CPLEX_FOUND AND NOT TARGET CPLEX::Cplex) ...@@ -181,7 +181,7 @@ if (CPLEX_FOUND AND NOT TARGET CPLEX::Cplex)
set(CPLEX_LINK_LIBRARIES ${CPLEX_LINK_LIBRARIES} m) set(CPLEX_LINK_LIBRARIES ${CPLEX_LINK_LIBRARIES} m)
endif () endif ()
set(CPLEX_LINK_LIBRARIES ${CPLEX_LINK_LIBRARIES} dl) set(CPLEX_LINK_LIBRARIES ${CPLEX_LINK_LIBRARIES})
add_library(CPLEX::Cplex STATIC IMPORTED GLOBAL) add_library(CPLEX::Cplex STATIC IMPORTED GLOBAL)
set_target_properties(CPLEX::Cplex PROPERTIES set_target_properties(CPLEX::Cplex PROPERTIES
......
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