Skip to content

Commit 377cc7a

Browse files
author
Yann Collette
committed
update projects due to Clp fixes
1 parent 59bc51c commit 377cc7a

File tree

7 files changed

+68
-24
lines changed

7 files changed

+68
-24
lines changed

‎Bonmin/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

‎Cbc/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

‎Cgl/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

‎CoinMP/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

‎Couenne/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ coinor-cmake
44
WARNING: due to a huge set of changes, these cmakefiles doesn't work up to now.
55
I am waiting for some stabilization before starting to fix these files.
66

7+
- Clp doesn't work with ABC ... bug in some ifdef macro.
8+
79
# CMake files for compiling CoinOr projects
810
## Introduction
911

‎SYMPHONY/Clp/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ get_ac_init_version(${Clp_DIR}/configure.ac CLP)
22

33
option(CLP_BUILD_EXAMPLES "Enable the building of examples" OFF)
44

5-
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number")
6-
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number")
7-
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number")
8-
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version")
5+
if (CLP_MAJOR_VERSION STREQUAL "devel")
6+
set(CLP_VERSION_MAJOR "1" CACHE STRING "The CLP major version number" FORCE)
7+
set(CLP_VERSION_MINOR "17" CACHE STRING "The CLP minor version number" FORCE)
8+
set(CLP_VERSION_RELEASE "6" CACHE STRING "The CLP patch version number" FORCE)
9+
set(CLP_VERSION "1.17.6" CACHE STRING "The CLP version" FORCE)
10+
else ()
11+
set(CLP_VERSION_MAJOR "${CLP_MAJOR_VERSION}" CACHE STRING "The CLP major version number" FORCE)
12+
set(CLP_VERSION_MINOR "${CLP_MINOR_VERSION}" CACHE STRING "The CLP minor version number" FORCE)
13+
set(CLP_VERSION_RELEASE "${CLP_PATCH_VERSION}" CACHE STRING "The CLP patch version number" FORCE)
14+
set(CLP_VERSION "${CLP_VERSION_STRING}" CACHE STRING "The CLP version" FORCE)
15+
endif ()
916

1017
set(CLP_WC_REVISION "0")
1118
if ((EXISTS "${Clp_DIR}/.svn") OR (EXISTS "${Clp_DIR}/../.svn"))

0 commit comments

Comments
 (0)