Skip to content

Commit 6366706

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 089db22 + cded74c commit 6366706

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if(POLICY CMP0167)
2020
cmake_policy(SET CMP0167 NEW)
2121
endif()
2222

23+
include(GNUInstallDirs)
24+
2325
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS_RELEASE}")
2426
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_RELEASE}")
2527

@@ -247,6 +249,12 @@ elseif(SYM STREQUAL "none")
247249
else()
248250
message(FATAL_ERROR "option SYM has wrong value")
249251
endif()
252+
if(SYM STREQUAL "sbliss" OR SYM STREQUAL "snauty" OR SYM STREQUAL "dejavu")
253+
install(FILES ${PROJECT_SOURCE_DIR}/src/dejavu/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/dejavu)
254+
endif()
255+
if(SYM STREQUAL "nauty" OR SYM STREQUAL "snauty")
256+
install(FILES ${PROJECT_SOURCE_DIR}/src/nauty/COPYRIGHT DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/nauty)
257+
endif()
250258

251259
# if changing these flags, also update GCCWARN/GXXWARN in make/make.project
252260
set(ADD_C_AND_CXX_FLAGS -pedantic -Wall -W -Wpointer-arith -Wcast-align -Wwrite-strings -Wshadow -Wredundant-decls -Wdisabled-optimization -Wno-long-long -Wno-unknown-pragmas -Wno-unused-parameter)
@@ -321,6 +329,7 @@ endif()
321329
#set expression interpreter file that should be used
322330
if(EXPRINT STREQUAL "cppad")
323331
set(exprinterpret scip/exprinterpret_cppad.cpp)
332+
install(FILES ${PROJECT_SOURCE_DIR}/src/cppad/COPYING DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/cppad)
324333
elseif(EXPRINT STREQUAL "none")
325334
set(exprinterpret scip/exprinterpret_none.c)
326335
else()
@@ -342,6 +351,7 @@ elseif(TPI STREQUAL "tny")
342351
set(tpisources tpi/tpi_tnycthrd.c tinycthread/tinycthread.c)
343352
find_package(Threads REQUIRED)
344353
set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
354+
install(FILES ${PROJECT_SOURCE_DIR}/src/tinycthread/COPYRIGHT DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/tinycthread)
345355
elseif(TPI STREQUAL "omp")
346356
set(TPI_OMP on)
347357
set(tpisources tpi/tpi_openmp.c)
@@ -879,6 +889,7 @@ if(AMPL)
879889
set(SCIP_WITH_AMPL ON)
880890
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src/amplmp/include)
881891
set(amplsrc scip/reader_nl.cpp amplmp/src/dtoa.cpp amplmp/src/format.cpp amplmp/src/expr-info.cpp amplmp/src/nl-reader.cpp amplmp/src/nl-utils.cpp amplmp/src/nl-writer2.cpp amplmp/src/os.cpp amplmp/src/posix.cpp)
892+
install(FILES ${PROJECT_SOURCE_DIR}/src/amplmp/LICENSE.rst DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/amplmp)
882893
else()
883894
message(STATUS "Support AMPL: OFF")
884895
set(SCIP_WITH_AMPL OFF)

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,10 @@ if(MSVC)
12601260
endif()
12611261
endif()
12621262

1263+
# Install SCIP's own and tclique license files
1264+
install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip)
1265+
install(FILES ${PROJECT_SOURCE_DIR}/src/tclique/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/tclique)
1266+
12631267
# Add all targets to the build-tree export set
12641268
export(TARGETS scip libscip
12651269
FILE "${PROJECT_BINARY_DIR}/scip-targets.cmake")

0 commit comments

Comments
 (0)