Skip to content

Commit 9adb6bb

Browse files
author
Yann Collette
committed
fix Clp / CoinUtils build - WIP
1 parent 9b8bd5f commit 9adb6bb

File tree

20 files changed

+120
-50
lines changed

20 files changed

+120
-50
lines changed

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

‎Clp/Clp/CMakeLists.txt

+31-28
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ mark_as_advanced(CLP_VERSION_MAJOR
3333
CLP_VERSION
3434
CLP_SVN_REV)
3535

36-
add_definitions(-DCLP_BUILD)
36+
add_definitions(-DCLPLIB_BUILD)
3737

3838
if (CMAKE_COMPILER_IS_GNUCXX)
3939
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long")
4040
endif ()
4141

42-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/Clp/include/config.h)
43-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config_clp.h.in ${CMAKE_BINARY_DIR}/Clp/include/config_clp.h)
42+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/Clp/include/config.h)
43+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config_clp.h.in ${CMAKE_BINARY_DIR}/Clp/include/config_clp.h)
44+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config_osiclp.h.in ${CMAKE_BINARY_DIR}/Clp/include/config_osiclp.h)
4445

4546
#
4647
# pkg-config file generation
@@ -287,8 +288,9 @@ if (COIN_ENABLE_DOWNLOAD_ASL OR COIN_USE_ASL)
287288
endif ()
288289

289290
macro(set_include_directories TARGET)
290-
target_include_directories(${TARGET} BEFORE PRIVATE ${CMAKE_BINARY_DIR}/Clp/include)
291291
target_include_directories(${TARGET} BEFORE PRIVATE ${CMAKE_BINARY_DIR}/CoinUtils/include)
292+
target_include_directories(${TARGET} BEFORE PRIVATE ${CMAKE_BINARY_DIR}/Osi/include)
293+
target_include_directories(${TARGET} BEFORE PRIVATE ${CMAKE_BINARY_DIR}/Clp/include)
292294
endmacro ()
293295

294296
if (WIN32)
@@ -785,30 +787,31 @@ if (CLP_BUILD_EXAMPLES)
785787

786788
set_tests_properties(clp_example_testBasis PROPERTIES PASS_REGULAR_EXPRESSION "Clp0000I Optimal - objective value -464.75")
787789
set_tests_properties(clp_example_testBasis PROPERTIES LABELS "DISTRIB;CLP;EXAMPLE")
788-
789-
add_example(testGub2 ${Clp_DIR}/examples/testGub2.cpp)
790-
791-
add_test(NAME clp_example_testGub2
792-
COMMAND $<TARGET_FILE:testGub2> ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Sample/afiro.mps)
793-
set_tests_properties(clp_example_testGub2 PROPERTIES TIMEOUT 30)
794-
if (WIN32)
795-
set_tests_properties(clp_example_testGub2 PROPERTIES ENVIRONMENT "PATH=${TEST_LIB_DIR}\\;${TEST_BIN_PATH}")
796-
endif ()
797-
798-
set_tests_properties(clp_example_testGub2 PROPERTIES PASS_REGULAR_EXPRESSION "Clp0000I Optimal - objective value -464.75")
799-
set_tests_properties(clp_example_testGub2 PROPERTIES LABELS "DISTRIB;CLP;EXAMPLE")
800-
801-
add_example(testGub ${Clp_DIR}/examples/testGub.cpp)
802-
803-
add_test(NAME clp_example_testGub
804-
COMMAND $<TARGET_FILE:testGub> ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Sample/afiro.mps)
805-
set_tests_properties(clp_example_testGub PROPERTIES TIMEOUT 30)
806-
if (WIN32)
807-
set_tests_properties(clp_example_testGub PROPERTIES ENVIRONMENT "PATH=${TEST_LIB_DIR}\\;${TEST_BIN_PATH}")
808-
endif ()
809-
810-
set_tests_properties(clp_example_testGub PROPERTIES PASS_REGULAR_EXPRESSION "Clp0000I Optimal - objective value -464.75")
811-
set_tests_properties(clp_example_testGub PROPERTIES LABELS "DISTRIB;CLP;EXAMPLE")
790+
791+
# DOESN'T COMPILE
792+
#add_example(testGub2 ${Clp_DIR}/examples/testGub2.cpp)
793+
#
794+
#add_test(NAME clp_example_testGub2
795+
# COMMAND $<TARGET_FILE:testGub2> ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Sample/afiro.mps)
796+
#set_tests_properties(clp_example_testGub2 PROPERTIES TIMEOUT 30)
797+
#if (WIN32)
798+
# set_tests_properties(clp_example_testGub2 PROPERTIES ENVIRONMENT "PATH=${TEST_LIB_DIR}\\;${TEST_BIN_PATH}")
799+
#endif ()
800+
#
801+
#set_tests_properties(clp_example_testGub2 PROPERTIES PASS_REGULAR_EXPRESSION "Clp0000I Optimal - objective value -464.75")
802+
#set_tests_properties(clp_example_testGub2 PROPERTIES LABELS "DISTRIB;CLP;EXAMPLE")
803+
804+
#add_example(testGub ${Clp_DIR}/examples/testGub.cpp)
805+
#
806+
#add_test(NAME clp_example_testGub
807+
# COMMAND $<TARGET_FILE:testGub> ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Sample/afiro.mps)
808+
#set_tests_properties(clp_example_testGub PROPERTIES TIMEOUT 30)
809+
#if (WIN32)
810+
# set_tests_properties(clp_example_testGub PROPERTIES ENVIRONMENT "PATH=${TEST_LIB_DIR}\\;${TEST_BIN_PATH}")
811+
#endif ()
812+
#
813+
#set_tests_properties(clp_example_testGub PROPERTIES PASS_REGULAR_EXPRESSION "Clp0000I Optimal - objective value -464.75")
814+
#set_tests_properties(clp_example_testGub PROPERTIES LABELS "DISTRIB;CLP;EXAMPLE")
812815

813816
add_example(testQP ${Clp_DIR}/examples/testQP.cpp)
814817

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#define COINUTILS_VERSION_RELEASE @COINUTILS_VERSION_RELEASE@
3939

4040
/* Define to the debug sanity check level (0 is no test) */
41-
#define COINUTILS_CHECKLEVEL @COIN_COINUTILS_CHECKLEVEL@
41+
#define COINUTILS_CHECKLEVEL @COINUTILS_CHECKLEVEL@
4242

4343
/* Define to the debug verbosity level (0 is no output) */
44-
#define COINUTILS_VERBOSITY @COIN_COINUTILS_VERBOSITY@
44+
#define COINUTILS_VERBOSITY @COINUTILS_VERBOSITY@
4545

4646
/* Define to be the name of C-function for Inf check */
4747
#define COINUTILS_C_FINITE @COIN_C_FINITE@

‎scripts/recreate.sh

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ rm -rf Osi
1515
rm -rf SYMPHONY
1616
rm -rf Vol
1717
rm -rf coinbrew
18+
rm -rf Data
1819

1920
git clone https://github.com/coin-or/coinbrew.git
2021
git clone https://github.com/coin-or/Bonmin.git
@@ -30,6 +31,9 @@ git clone https://github.com/coin-or/Osi.git
3031
git clone https://github.com/coin-or/SYMPHONY.git
3132
git clone https://github.com/coin-or/Vol.git
3233

34+
mkdir Data
35+
git clone https://github.com/coin-or-tools/Data-Sample Data/Sample
36+
3337
add_tag () {
3438
TAGID=`git log | tail | grep commit | sed -e "s/commit\(.*\)/\1/"`
3539
echo "add tag 'initial_import' to commit ID $TAGID in `pwd`"

0 commit comments

Comments
 (0)