Skip to content

Commit 5ef9b1b

Browse files
author
Yann Collette
committed
fix build - Cbc still doesn't compile because of bugs in Cbc code
1 parent 213b1d6 commit 5ef9b1b

File tree

104 files changed

+509
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+509
-21
lines changed

‎Bonmin/Cbc/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ else ()
298298
include_directories(${Cgl_DIR}/src/CglMixedIntegerRounding)
299299
include_directories(${Cgl_DIR}/src/CglMixedIntegerRounding2)
300300
include_directories(${Cgl_DIR}/src/CglOddHole)
301+
include_directories(${Cgl_DIR}/src/CglOddWheel)
301302
include_directories(${Cgl_DIR}/src/CglPreProcess)
302303
include_directories(${Cgl_DIR}/src/CglProbing)
303304
include_directories(${Cgl_DIR}/src/CglRedSplit)

‎Bonmin/Cbc/include/config.h.in

+20
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
11
/* Library Visibility Attribute */
2+
#ifndef CGLLIB_EXPORT
3+
#cmakedefine CGLLIB_EXPORT @CGLLIB_EXPORT@
4+
#endif
5+
6+
/* Library Visibility Attribute */
7+
#ifndef CGLUNITTEST_EXPORT
8+
#cmakedefine CGLUNITTEST_EXPORT @CGLUNITTEST_EXPORT@
9+
#endif
10+
11+
/* Library Visibility Attribute */
12+
#ifndef CBCGENERIC_EXPORT
213
#cmakedefine CBCGENERIC_EXPORT @CBCGENERIC_EXPORT@
14+
#endif
315

416
/* Library Visibility Attribute */
17+
#ifndef CBCLIB_EXPORT
518
#cmakedefine CBCLIB_EXPORT @CBCLIB_EXPORT@
19+
#endif
620

721
/* Library Visibility Attribute */
22+
#ifndef CBCSOLVERLIB_EXPORT
823
#cmakedefine CBCSOLVERLIB_EXPORT @CBCSOLVERLIB_EXPORT@
24+
#endif
925

1026
/* Library Visibility Attribute */
27+
#ifndef CBCUNITTEST_EXPORT
1128
#cmakedefine CBCUNITTEST_EXPORT @CBCUNITTEST_EXPORT@
29+
#endif
1230

1331
/* Library Visibility Attribute */
32+
#ifndef OSICBCLIB_EXPORT
1433
#cmakedefine OSICBCLIB_EXPORT @OSICBCLIB_EXPORT@
34+
#endif
1535

1636
/* Define to the name of the default solver to be used in cbc-generic in small
1737
letters */

‎Bonmin/Cbc/include/config_osicbc.h.in

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* src/config_osicbc.h.in. */
2+
3+
#ifndef __CONFIG_OSICBC_H__
4+
#define __CONFIG_OSICBC_H__
5+
6+
/* Library Visibility Attribute */
7+
#ifndef OSICBCLIB_EXPORT
8+
#cmakedefine OSICBCLIB_EXPORT @OSICBCLIB_EXPORT@
9+
#endif
10+
11+
#endif

‎Bonmin/Cgl/CMakeLists.txt

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

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

5-
set(CGL_VERSION_MAJOR "${CGL_MAJOR_VERSION}" CACHE STRING "The CGL major version number")
6-
set(CGL_VERSION_MINOR "${CGL_MINOR_VERSION}" CACHE STRING "The CGL minor version number")
7-
set(CGL_VERSION_RELEASE "${CGL_PATCH_VERSION}" CACHE STRING "The CGL patch version number")
8-
set(CGL_VERSION "${CGL_VERSION_STRING}" CACHE STRING "The CGL version")
5+
if (CGL_VERSION_MAJOER STREQUAL "devel")
6+
set(CGL_VERSION_MAJOR "0" CACHE STRING "The CGL major version number" FORCE)
7+
set(CGL_VERSION_MINOR "60" CACHE STRING "The CGL minor version number" FORCE)
8+
set(CGL_VERSION_RELEASE "3" CACHE STRING "The CGL patch version number" FORCE)
9+
set(CGL_VERSION "0.60.3" CACHE STRING "The CGL version" FORCE)
10+
else ()
11+
set(CGL_VERSION_MAJOR "${CGL_MAJOR_VERSION}" CACHE STRING "The CGL major version number" FORCE)
12+
set(CGL_VERSION_MINOR "${CGL_MINOR_VERSION}" CACHE STRING "The CGL minor version number" FORCE)
13+
set(CGL_VERSION_RELEASE "${CGL_PATCH_VERSION}" CACHE STRING "The CGL patch version number" FORCE)
14+
set(CGL_VERSION "${CGL_VERSION_STRING}" CACHE STRING "The CGL version" FORCE)
15+
endif ()
916

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

‎Bonmin/Cgl/include/config.h.in

+4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
/* src/config.h.in. Generated from configure.ac by autoheader. */
22

33
/* Library Visibility Attribute */
4+
#ifndef CGLLIB_EXPORT
45
#cmakedefine CGLLIB_EXPORT @CGLLIB_EXPORT@
6+
#endif
57

68
/* Library Visibility Attribute */
9+
#ifndef CGLUNITTEST_EXPORT
710
#cmakedefine CGLUNITTEST_EXPORT @CGLUNITTEST_EXPORT@
11+
#endif
812

913
/* SVN revision number of project */
1014
#define CGL_SVN_REV @CGL_SVN_REV@

‎Bonmin/Clp/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ if (COIN_HAS_WSMP AND (NOT COIN_HAS_WSMP_INCLUDE_PATH STREQUAL "None"))
286286
include_directories(${COIN_HAS_WSMP_INCLUDE_PATH})
287287
endif ()
288288

289+
include_directories(${CMAKE_SOURCE_DIR}/src)
289290
include_directories(${BuildTools_DIR}/headers)
290291
include_directories(SYSTEM ${CoinUtils_DIR}/src)
291292
include_directories(${Clp_DIR}/src)

‎Bonmin/Clp/include/config.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef CLPLIB_EXPORT
23
#cmakedefine CLPLIB_EXPORT @CLPLIB_EXPORT@
4+
#endif
35

46
/* Define to 1, 2, 3, or 4 if Aboca should be build. */
57
#cmakedefine CLP_HAS_ABC @COIN_ABC_LEVEL@

‎Bonmin/Clp/include/config_clp.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef CLPLIB_EXPORT
23
#cmakedefine CLPLIB_EXPORT @CLPLIB_EXPORT@
4+
#endif
35

46
/* Define to 1, 2, 3, or 4 if Aboca should be build. */
57
#cmakedefine CLP_HAS_ABC @COIN_ABC_LEVEL@

‎Bonmin/Clp/include/config_osiclp.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#define __CONFIG_OSICLP_H__
55

66
/* Library Visibility Attribute */
7+
#ifndef OSICLPLIB_EXPORT
78
#cmakedefine OSICLPLIB_EXPORT @OSICLPLIB_EXPORT@
9+
#endif
810

911
#endif

‎Bonmin/CoinUtils/include/config.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef COINUTILSLIB_EXPORT
23
#cmakedefine COINUTILSLIB_EXPORT @COINUTILSLIB_EXPORT@
4+
#endif
35

46
/* Define to 1 if CoinBigIndex is int */
57
#define COINUTILS_BIGINDEX_IS_INT @COINUTILS_BIGINDEX_IS_INT@

‎Bonmin/CoinUtils/include/config_coinutils.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#define __CONFIG_COINUTILS_H__
33

44
/* Library Visibility Attribute */
5+
#ifndef COINUTILSLIB_EXPORT
56
#cmakedefine COINUTILSLIB_EXPORT @COINUTILSLIB_EXPORT@
7+
#endif
68

79
/* Version number of project */
810
#define COINUTILS_VERSION "@COINUTILS_VERSION@"

‎Bonmin/Osi/Osi/include/config.h.in

+16
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,44 @@
22
#cmakedefine CXX_NO_MINUS_C_MINUS_O
33

44
/* Library Visibility Attribute */
5+
#ifndef OSICOMMONTESTLIB_EXPORT
56
#define OSICOMMONTESTLIB_EXPORT @OSICOMMONTESTLIB_EXPORT@
7+
#endif
68

79
/* Library Visibility Attribute */
10+
#ifndef OSICPXLIB_EXPORT
811
#define OSICPXLIB_EXPORT @OSICPXLIB_EXPORT@
12+
#endif
913

1014
/* Library Visibility Attribute */
15+
#ifndef OSIGLPKLIB_EXPORT
1116
#define OSIGLPKLIB_EXPORT @OSIGLPKLIB_EXPORT@
17+
#endif
1218

1319
/* Library Visibility Attribute */
20+
#ifndef OSIGRBLIB_EXPORT
1421
#define OSIGRBLIB_EXPORT @OSIGLPKLIB_EXPORT@
22+
#endif
1523

1624
/* Library Visibility Attribute */
25+
#ifndef OSILIB_EXPORT
1726
#define OSILIB_EXPORT @OSIGLPKLIB_EXPORT@
27+
#endif
1828

1929
/* Library Visibility Attribute */
30+
#ifndef OSIMSKLIB_EXPORT
2031
#define OSIMSKLIB_EXPORT @OSIMSKLIB_EXPORT@
32+
#endif
2133

2234
/* Library Visibility Attribute */
35+
#ifndef OSITEST_EXPORT
2336
#define OSITEST_EXPORT @OSITEST_EXPORT@
37+
#endif
2438

2539
/* Library Visibility Attribute */
40+
#ifndef OSIXPRLIB_EXPORT
2641
#define OSIXPRLIB_EXPORT @OSIXPRLIB_EXPORT@
42+
#endif
2743

2844
/* Define to 1 if CoinUtils is available. */
2945
#cmakedefine OSI_HAS_COINUTILS

‎Bonmin/Osi/Osi/include/config_osi.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#define __CONFIG_OSI_H__
33

44
/* Library Visibility Attribute */
5+
#ifndef OSILIB_EXPORT
56
#define OSILIB_EXPORT @OSILIB_EXPORT@
7+
#endif
68

79
/* Version number of project */
810
#define OSI_VERSION "@OSI_VERSION@"

‎Bonmin/Osi/Osi/include/config_osicommontest.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#define __CONFIG_OSICOMMONTEST_H__
55

66
/* Library Visibility Attribute */
7+
#ifndef OSICOMMONTESTLIB_EXPORT
78
#define OSICOMMONTESTLIB_EXPORT @OSICOMMONTESTLIB_EXPORT@
9+
#endif
810

911
#endif

‎Cbc/CMakeLists.txt

+9-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ option(CBC_USE_THREADS "Enable the compilation of the SMP version of CBC" OFF)
99
set(CBC_DEFAULT_SOLVER "clp" CACHE STRING "The name of the default solver to be used in cbc-generic (clp, dylp, glpk, soplex)")
1010
set(CBC_CHECKLEVEL "0" CACHE STRING "The debug sanity check level of Cbc (0 if no test)")
1111
set(CBC_VERBOSITY "0" CACHE STRING "The debug verbosity level of Cbc (0 if no output)")
12+
# BUG: there is still a COIN_CBC_VERBOSITY in the code ...
13+
set(COIN_CBC_VERBOSITY "${CBC_VERBOSITY}")
1214

1315
# Clp options
1416
option(COIN_ENABLE_AMD "Clp uses the AMD linear solver" OFF)
@@ -857,6 +859,9 @@ endif ()
857859
if (WIN32)
858860
set(COINUTILSLIB_EXPORT "__declspec(dllimport)")
859861

862+
set(CGLLIB_EXPORT "__declspec(dllimport)")
863+
set(CGLUNITTEST_EXPORT "__declspec(dllimport)")
864+
860865
set(OSILIB_EXPORT "__declspec(dllimport)")
861866
set(OSICOMMONTESTLIB_EXPORT "__declspec(dllimport)")
862867
set(OSIGLPKLIB_EXPORT "__declspec(dllimport)")
@@ -878,6 +883,9 @@ if (WIN32)
878883
else ()
879884
set(COINUTILSLIB_EXPORT "__attribute__((visibility(\"default\")))")
880885

886+
set(CGLLIB_EXPORT "__attribute__((visibility(\"default\")))")
887+
set(CGLUNITTEST_EXPORT "__attribute__((visibility(\"default\")))")
888+
881889
set(OSICOMMONTESTLIB_EXPORT "__attribute__((visibility(\"default\")))")
882890
set(OSIGLPKLIB_EXPORT "__attribute__((visibility(\"default\")))")
883891
set(OSISPXLIB_EXPORT "__attribute__((visibility(\"default\")))")
@@ -898,7 +906,7 @@ else ()
898906
endif ()
899907

900908
add_definitions(-DHAVE_CONFIG_H)
901-
add_definitions(-DCBCLIB_BUILD -DCBCSOLVERLIB_BUILD)
909+
add_definitions(-DCBCLIB_BUILD -DCBCSOLVERLIB_BUILD -DCGLLIB_BUILD)
902910

903911
#-----------------------------------------------
904912
# Doxygen documentation

‎Cbc/Cbc/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ else ()
298298
include_directories(${Cgl_DIR}/src/CglMixedIntegerRounding)
299299
include_directories(${Cgl_DIR}/src/CglMixedIntegerRounding2)
300300
include_directories(${Cgl_DIR}/src/CglOddHole)
301+
include_directories(${Cgl_DIR}/src/CglOddWheel)
301302
include_directories(${Cgl_DIR}/src/CglPreProcess)
302303
include_directories(${Cgl_DIR}/src/CglProbing)
303304
include_directories(${Cgl_DIR}/src/CglRedSplit)

‎Cbc/Cbc/include/config.h.in

+20
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
11
/* Library Visibility Attribute */
2+
#ifndef CGLLIB_EXPORT
3+
#cmakedefine CGLLIB_EXPORT @CGLLIB_EXPORT@
4+
#endif
5+
6+
/* Library Visibility Attribute */
7+
#ifndef CGLUNITTEST_EXPORT
8+
#cmakedefine CGLUNITTEST_EXPORT @CGLUNITTEST_EXPORT@
9+
#endif
10+
11+
/* Library Visibility Attribute */
12+
#ifndef CBCGENERIC_EXPORT
213
#cmakedefine CBCGENERIC_EXPORT @CBCGENERIC_EXPORT@
14+
#endif
315

416
/* Library Visibility Attribute */
17+
#ifndef CBCLIB_EXPORT
518
#cmakedefine CBCLIB_EXPORT @CBCLIB_EXPORT@
19+
#endif
620

721
/* Library Visibility Attribute */
22+
#ifndef CBCSOLVERLIB_EXPORT
823
#cmakedefine CBCSOLVERLIB_EXPORT @CBCSOLVERLIB_EXPORT@
24+
#endif
925

1026
/* Library Visibility Attribute */
27+
#ifndef CBCUNITTEST_EXPORT
1128
#cmakedefine CBCUNITTEST_EXPORT @CBCUNITTEST_EXPORT@
29+
#endif
1230

1331
/* Library Visibility Attribute */
32+
#ifndef OSICBCLIB_EXPORT
1433
#cmakedefine OSICBCLIB_EXPORT @OSICBCLIB_EXPORT@
34+
#endif
1535

1636
/* Define to the name of the default solver to be used in cbc-generic in small
1737
letters */

‎Cbc/Cbc/include/config_osicbc.h.in

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* src/config_osicbc.h.in. */
2+
3+
#ifndef __CONFIG_OSICBC_H__
4+
#define __CONFIG_OSICBC_H__
5+
6+
/* Library Visibility Attribute */
7+
#ifndef OSICBCLIB_EXPORT
8+
#cmakedefine OSICBCLIB_EXPORT @OSICBCLIB_EXPORT@
9+
#endif
10+
11+
#endif

‎Cbc/Cgl/CMakeLists.txt

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

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

5-
set(CGL_VERSION_MAJOR "${CGL_MAJOR_VERSION}" CACHE STRING "The CGL major version number")
6-
set(CGL_VERSION_MINOR "${CGL_MINOR_VERSION}" CACHE STRING "The CGL minor version number")
7-
set(CGL_VERSION_RELEASE "${CGL_PATCH_VERSION}" CACHE STRING "The CGL patch version number")
8-
set(CGL_VERSION "${CGL_VERSION_STRING}" CACHE STRING "The CGL version")
5+
if (CGL_VERSION_MAJOER STREQUAL "devel")
6+
set(CGL_VERSION_MAJOR "0" CACHE STRING "The CGL major version number" FORCE)
7+
set(CGL_VERSION_MINOR "60" CACHE STRING "The CGL minor version number" FORCE)
8+
set(CGL_VERSION_RELEASE "3" CACHE STRING "The CGL patch version number" FORCE)
9+
set(CGL_VERSION "0.60.3" CACHE STRING "The CGL version" FORCE)
10+
else ()
11+
set(CGL_VERSION_MAJOR "${CGL_MAJOR_VERSION}" CACHE STRING "The CGL major version number" FORCE)
12+
set(CGL_VERSION_MINOR "${CGL_MINOR_VERSION}" CACHE STRING "The CGL minor version number" FORCE)
13+
set(CGL_VERSION_RELEASE "${CGL_PATCH_VERSION}" CACHE STRING "The CGL patch version number" FORCE)
14+
set(CGL_VERSION "${CGL_VERSION_STRING}" CACHE STRING "The CGL version" FORCE)
15+
endif ()
916

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

‎Cbc/Cgl/include/config.h.in

+4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
/* src/config.h.in. Generated from configure.ac by autoheader. */
22

33
/* Library Visibility Attribute */
4+
#ifndef CGLLIB_EXPORT
45
#cmakedefine CGLLIB_EXPORT @CGLLIB_EXPORT@
6+
#endif
57

68
/* Library Visibility Attribute */
9+
#ifndef CGLUNITTEST_EXPORT
710
#cmakedefine CGLUNITTEST_EXPORT @CGLUNITTEST_EXPORT@
11+
#endif
812

913
/* SVN revision number of project */
1014
#define CGL_SVN_REV @CGL_SVN_REV@

‎Cbc/Clp/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ if (COIN_HAS_WSMP AND (NOT COIN_HAS_WSMP_INCLUDE_PATH STREQUAL "None"))
286286
include_directories(${COIN_HAS_WSMP_INCLUDE_PATH})
287287
endif ()
288288

289+
include_directories(${CMAKE_SOURCE_DIR}/src)
289290
include_directories(${BuildTools_DIR}/headers)
290291
include_directories(SYSTEM ${CoinUtils_DIR}/src)
291292
include_directories(${Clp_DIR}/src)

‎Cbc/Clp/include/config.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef CLPLIB_EXPORT
23
#cmakedefine CLPLIB_EXPORT @CLPLIB_EXPORT@
4+
#endif
35

46
/* Define to 1, 2, 3, or 4 if Aboca should be build. */
57
#cmakedefine CLP_HAS_ABC @COIN_ABC_LEVEL@

‎Cbc/Clp/include/config_clp.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef CLPLIB_EXPORT
23
#cmakedefine CLPLIB_EXPORT @CLPLIB_EXPORT@
4+
#endif
35

46
/* Define to 1, 2, 3, or 4 if Aboca should be build. */
57
#cmakedefine CLP_HAS_ABC @COIN_ABC_LEVEL@

‎Cbc/Clp/include/config_osiclp.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#define __CONFIG_OSICLP_H__
55

66
/* Library Visibility Attribute */
7+
#ifndef OSICLPLIB_EXPORT
78
#cmakedefine OSICLPLIB_EXPORT @OSICLPLIB_EXPORT@
9+
#endif
810

911
#endif

‎Cbc/CoinUtils/include/config.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Library Visibility Attribute */
2+
#ifndef COINUTILSLIB_EXPORT
23
#cmakedefine COINUTILSLIB_EXPORT @COINUTILSLIB_EXPORT@
4+
#endif
35

46
/* Define to 1 if CoinBigIndex is int */
57
#define COINUTILS_BIGINDEX_IS_INT @COINUTILS_BIGINDEX_IS_INT@

‎Cbc/CoinUtils/include/config_coinutils.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#define __CONFIG_COINUTILS_H__
33

44
/* Library Visibility Attribute */
5+
#ifndef COINUTILSLIB_EXPORT
56
#cmakedefine COINUTILSLIB_EXPORT @COINUTILSLIB_EXPORT@
7+
#endif
68

79
/* Version number of project */
810
#define COINUTILS_VERSION "@COINUTILS_VERSION@"

0 commit comments

Comments
 (0)