From d521978451e42924f6366eb8fce594c231cd6e0b Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Fri, 12 Apr 2019 14:13:25 +0200 Subject: [PATCH 1/4] Update LICENSE Try to mark it as MIT. --- LICENSE | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 46cf08363e..954bb89e55 100755 --- a/LICENSE +++ b/LICENSE @@ -1,10 +1,13 @@ - GECODE LICENSE AGREEMENT - -This software and its documentation are copyrighted by the +GECODE LICENSE AGREEMENT + + (MIT License) + +This software and its documentation are copyrighted by the individual authors as listed in each file. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including From 027c57889d66dd26ad8e1a419c2cda22ab0cf305 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Fri, 12 Apr 2019 14:14:40 +0200 Subject: [PATCH 2/4] Update LICENSE Formatting. --- LICENSE | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 954bb89e55..5e5863dc39 100755 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,12 @@ -GECODE LICENSE AGREEMENT + GECODE LICENSE AGREEMENT - (MIT License) + (MIT License) This software and its documentation are copyrighted by the individual authors as listed in each file. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including From a3d1b6bdb1859019130007de9f5c5c33d1c1766b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 28 Apr 2022 00:51:05 +0200 Subject: [PATCH 3/4] Remove obsolete CMake version conditional As the minimum version is 3.7.0 now, the condition is always true. --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6499c926a..8606b3870a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,9 +55,8 @@ if (GECODE_DISABLE_WARNINGS) endif () endif () -if ( (CMAKE_VERSION VERSION_GREATER 3.1.0) OR (CMAKE_VERSION VERSION_EQUAL 3.1.0) ) - set (CMAKE_CXX_STANDARD 11) -endif() +set (CMAKE_CXX_STANDARD 11) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17.0) cmake_policy(SET CMP0100 NEW) endif() From 832cb9c9c3ef0035132efc6c0aae78e0e6810d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 28 Apr 2022 00:52:20 +0200 Subject: [PATCH 4/4] Extract soversion from configure.ac and set as cmake target property --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8606b3870a..85ec94c29d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,6 +154,8 @@ foreach (line "${EXTRA_CONFIG}" ${LINES}) set(VERSION ${CMAKE_MATCH_2}) set(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) message(STATUS "Got VERSION=${VERSION} from configure.ac") + elseif (line MATCHES "ac_gecode_soversion=(.*)\n") + set(GECODE_SOVERSION "${CMAKE_MATCH_1}") elseif (line MATCHES "ac_gecode_flatzincversion=(.*)\n") set(GECODE_FLATZINC_VERSION "${CMAKE_MATCH_1}") elseif (line MATCHES "AH_BOTTOM\\(\\[(.*)") @@ -415,6 +417,7 @@ foreach (lib support kernel search int set float add_library(gecode${lib} ${sources} ${${libupper}HDR}) target_include_directories(gecode${lib} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) + set_target_properties(gecode${lib} PROPERTIES SOVERSION ${GECODE_SOVERSION}) list(APPEND GECODE_INSTALL_TARGETS gecode${lib}) endif () endforeach ()