From bb7d5bd7ff9064e43b5d96fffaa6cb7ece85145b Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Fri, 4 Feb 2022 16:38:13 -0500 Subject: [PATCH 1/3] version number updates for release 0.60.5 --- Cgl/configure | 22 +++++++++++----------- Cgl/configure.ac | 4 ++-- Cgl/src/config_cgl_default.h | 4 ++-- README.md | 15 +++++++-------- configure | 20 ++++++++++---------- configure.ac | 2 +- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Cgl/configure b/Cgl/configure index 7dff6cde..939a5194 100755 --- a/Cgl/configure +++ b/Cgl/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Cgl 0.60. +# Generated by GNU Autoconf 2.59 for Cgl 0.60.5. # # Report bugs to . # @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Cgl' PACKAGE_TARNAME='cgl' -PACKAGE_VERSION='0.60' -PACKAGE_STRING='Cgl 0.60' +PACKAGE_VERSION='0.60.5' +PACKAGE_STRING='Cgl 0.60.5' PACKAGE_BUGREPORT='cgl@list.coin-or.org' ac_unique_file="src/CglMessage.hpp" @@ -1009,7 +1009,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cgl 0.60 to adapt to many kinds of systems. +\`configure' configures Cgl 0.60.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1075,7 +1075,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cgl 0.60:";; + short | recursive ) echo "Configuration of Cgl 0.60.5:";; esac cat <<\_ACEOF @@ -1284,7 +1284,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Cgl configure 0.60 +Cgl configure 0.60.5 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1304,7 +1304,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cgl $as_me 0.60, which was +It was created by Cgl $as_me 0.60.5, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1830,7 +1830,7 @@ _ACEOF # Capture libtool library version, if given. - + coin_libversion=11:5:10 @@ -4537,7 +4537,7 @@ fi # Define the identity of the package. PACKAGE='cgl' - VERSION='0.60' + VERSION='0.60.5' cat >>confdefs.h <<_ACEOF @@ -27598,7 +27598,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Cgl $as_me 0.60, which was +This file was extended by Cgl $as_me 0.60.5, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27661,7 +27661,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Cgl config.status 0.60 +Cgl config.status 0.60.5 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Cgl/configure.ac b/Cgl/configure.ac index d0c37db8..6cb430cf 100644 --- a/Cgl/configure.ac +++ b/Cgl/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Cgl],[0.60],[cgl@list.coin-or.org]) +AC_INIT([Cgl],[0.60.5],[cgl@list.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others. @@ -41,7 +41,7 @@ AC_CANONICAL_BUILD # the source root directory contains definition of where to find those # externals. The following macro ensures that those externals are # retrieved by svn if they are not there yet. -AC_COIN_PROJECTDIR_INIT(Cgl) +AC_COIN_PROJECTDIR_INIT(Cgl,11:5:10) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Cgl) diff --git a/Cgl/src/config_cgl_default.h b/Cgl/src/config_cgl_default.h index 7589aa3c..de480743 100644 --- a/Cgl/src/config_cgl_default.h +++ b/Cgl/src/config_cgl_default.h @@ -5,7 +5,7 @@ /***************************************************************************/ /* Version number of project */ -#define CGL_VERSION "0.60" +#define CGL_VERSION "0.60.5" /* Major Version number of project */ #define CGL_VERSION_MAJOR 0 @@ -14,4 +14,4 @@ #define CGL_VERSION_MINOR 60 /* Release Version number of project */ -#define CGL_VERSION_RELEASE 9999 +#define CGL_VERSION_RELEASE 5 diff --git a/README.md b/README.md index 2d7de7cb..a01f8dd3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cgl 0.60 +# Cgl 0.60.5 [![A COIN-OR Project](https://coin-or.github.io/coin-or-badge.png)](https://www.coin-or.org) @@ -83,12 +83,11 @@ The Cgl development site is https://github.com/coin-or/Cgl. Code: [![DOI](https://zenodo.org/badge/173502902.svg)](https://zenodo.org/badge/latestdoi/173502902) - ## CURRENT BUILD STATUS -[![Windows Builds](https://github.com/coin-or/Cgl/actions/workflows/windows-ci.yml/badge.svg?branch=stable/0.60)](https://github.com/coin-or/Cgl/actions/workflows/windows-ci.yml?query=branch%3Astable/0.60) +[![Windows Builds](https://github.com/coin-or/Cgl/actions/workflows/windows-ci.yml/badge.svg?branch=releases/0.60.5)](https://github.com/coin-or/Cgl/actions/workflows/windows-ci.yml?query=branch%3Areleases/0.60.5) -[![Linux and MacOS Builds](https://github.com/coin-or/Cgl/actions/workflows/linux-ci.yml/badge.svg?branch=stable/0.60)](https://github.com/coin-or/Cgl/actions/workflows/linux-ci.yml?query=branch%3Astable/0.60) +[![Linux and MacOS Builds](https://github.com/coin-or/Cgl/actions/workflows/linux-ci.yml/badge.svg?branch=releases/0.60.5)](https://github.com/coin-or/Cgl/actions/workflows/linux-ci.yml?query=branch%3Areleases/0.60.5) ## DOWNLOAD @@ -124,8 +123,8 @@ If binaries are not available for your platform for the latest version and you w Source code can be obtained either by * Downloading a snapshot of the source code for the latest release version of Cgl from the - [releases](https://github.com/coin-or/Cgl/releases) page. - * Cloning this repository from [Github](https://github.com/coin-or/Cgl) or + [releases](https://github.com/coin-or/Cgl/releases) page, + * Cloning this repository from [Github](https://github.com/coin-or/Cgl), or * Using the [coinbrew](https://github.com/coin-or/coinbrew) script to get the project and all dependencies (recommended, see below). ### Dependencies @@ -150,7 +149,7 @@ following on the command line. ``` wget https://raw.githubusercontent.com/coin-or/coinbrew/master/coinbrew chmod u+x coinbrew -./coinbrew fetch Cgl@0.60 +./coinbrew fetch Cgl@0.60.5 ./coinbrew build Cgl ``` For more detailed instructions on coinbrew, see https://coin-or.github.io/coinbrew. @@ -176,7 +175,7 @@ If you have `Doxygen` available, you can build a HTML documentation by typing `make doxygen-docs` in the build directory. If Cgl was built via `coinbrew`, then the build -directory will be `./build/Cgl/0.60` by default. The doxygen documentation main file +directory will be `./build/Cgl/0.60.5` by default. The doxygen documentation main file is found at `/doxydoc/html/index.html`. If you don't have `doxygen` installed locally, you can use also find the diff --git a/configure b/configure index 0419867f..3e2bb74c 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac 0.9. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Cgl 0.60. +# Generated by GNU Autoconf 2.59 for Cgl 0.60.5. # # Report bugs to . # @@ -430,8 +430,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Cgl' PACKAGE_TARNAME='cgl' -PACKAGE_VERSION='0.60' -PACKAGE_STRING='Cgl 0.60' +PACKAGE_VERSION='0.60.5' +PACKAGE_STRING='Cgl 0.60.5' PACKAGE_BUGREPORT='cgl@lists.coin-or.org' ac_unique_file="configure.ac" @@ -1033,7 +1033,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cgl 0.60 to adapt to many kinds of systems. +\`configure' configures Cgl 0.60.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1099,7 +1099,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cgl 0.60:";; + short | recursive ) echo "Configuration of Cgl 0.60.5:";; esac cat <<\_ACEOF @@ -1296,7 +1296,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Cgl configure 0.60 +Cgl configure 0.60.5 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1316,7 +1316,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cgl $as_me 0.60, which was +It was created by Cgl $as_me 0.60.5, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5073,7 +5073,7 @@ fi # Define the identity of the package. PACKAGE='cgl' - VERSION='0.60' + VERSION='0.60.5' cat >>confdefs.h <<_ACEOF @@ -22399,7 +22399,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Cgl $as_me 0.60, which was +This file was extended by Cgl $as_me 0.60.5, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22457,7 +22457,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Cgl config.status 0.60 +Cgl config.status 0.60.5 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 79a85046..8fc51c8a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Cgl],[0.60],[cgl@lists.coin-or.org]) +AC_INIT([Cgl],[0.60.5],[cgl@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others. From 7181df51fdfd15239eefc0a066a7fab83d13ebaf Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 3 Apr 2019 14:09:26 +0200 Subject: [PATCH 2/3] Add CMake based build - Fix super build (e.g. FetchContent) integration - cmake: option() honors normal variables (CMP0077) --- .gitignore | 4 + CMakeLists.txt | 110 +++++++++++++++++++++++++++ Cgl/CMakeLists.txt | 153 ++++++++++++++++++++++++++++++++++++++ Cgl/config.h.cmake.in | 114 ++++++++++++++++++++++++++++ Cgl/config_cgl.h.cmake.in | 13 ++++ cmake/CheckEnv.cmake | 151 +++++++++++++++++++++++++++++++++++++ cmake/Config.cmake.in | 19 +++++ cmake/ParseAc.cmake | 28 +++++++ 8 files changed, 592 insertions(+) create mode 100644 .gitignore create mode 100644 CMakeLists.txt create mode 100644 Cgl/CMakeLists.txt create mode 100644 Cgl/config.h.cmake.in create mode 100644 Cgl/config_cgl.h.cmake.in create mode 100644 cmake/CheckEnv.cmake create mode 100644 cmake/Config.cmake.in create mode 100644 cmake/ParseAc.cmake diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..0b76a74b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.swp +.vs/ +build/ +cache/ diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..4a70789d --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,110 @@ +cmake_minimum_required(VERSION 3.15) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +# option() honors normal variables. +if(POLICY CMP0077) + cmake_policy(SET CMP0077 NEW) +endif() + +# MSVC runtime library flags are selected by an abstraction. +if(POLICY CMP0091) + cmake_policy(SET CMP0091 NEW) +endif() + +include(ParseAc) +parse_ac(VERSION MAJOR MINOR PATCH) + +project(Cgl VERSION ${VERSION}) + +# config options +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING + "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." + FORCE) +endif(NOT CMAKE_BUILD_TYPE) + +option(BUILD_SHARED_LIBS "" ON) +if(BUILD_SHARED_LIBS AND MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +endif(BUILD_SHARED_LIBS AND MSVC) + +# config options +if(MSVC) + # Build with multiple processes + add_definitions(/MP) + add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_DEPRECATE) + # MSVC warning suppressions + add_definitions( + /wd4018 # 'expression' : signed/unsigned mismatch + /wd4065 # switch statement contains 'default' but no 'case' labels + /wd4101 # 'identifier' : unreferenced local variable + /wd4102 # 'label' : unreferenced label + /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data + /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data + /wd4309 # 'conversion' : truncation of constant value + /wd4805 # 'operation' : unsafe mix of type 'type1' and type 'type2' in operation. + /wd4996 # The compiler encountered a deprecated declaration. + ) +endif() +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") +endif(APPLE) + +# ZLIB +if(NOT TARGET ZLIB::ZLIB) + find_package(ZLIB) +endif() +if(ZLIB_FOUND OR TARGET ZLIB::ZLIB) + message(STATUS "Use zlib") + set(HAVE_ZLIB_H "1" CACHE INTERNAL "Use zlib") + set(COIN_HAS_ZLIB "1" CACHE INTERNAL "Use zlib") +endif() + +# PThread +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads) +if(CMAKE_USE_PTHREADS_INIT) + set(PTHREADS_FOUND TRUE) +else() + set(PTHREADS_FOUND FALSE) +endif() + +# CoinUtils +if(NOT TARGET Coin::CoinUtils) + find_package(CoinUtils REQUIRED CONFIG) +endif() +# Osi +if(NOT TARGET Coin::Osi) + find_package(Osi REQUIRED CONFIG) +endif() +# Clp +if(NOT TARGET Coin::Clp) + find_package(Clp REQUIRED CONFIG) +endif() + +include(CheckEnv) +include(CTest) + +add_subdirectory(Cgl) + +include(GNUInstallDirs) +install(EXPORT ${PROJECT_NAME}Targets + NAMESPACE Coin:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +include(CMakePackageConfigHelpers) +configure_package_config_file(cmake/Config.cmake.in + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + COMPATIBILITY SameMajorVersion) +install( + FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + COMPONENT Devel) diff --git a/Cgl/CMakeLists.txt b/Cgl/CMakeLists.txt new file mode 100644 index 00000000..17ec0f05 --- /dev/null +++ b/Cgl/CMakeLists.txt @@ -0,0 +1,153 @@ +set(NAME "CGL") + +# PTHREAD +if(PTHREADS_FOUND) + set(${NAME}_PTHREADS "1" CACHE INTERNAL "Use pthread") +endif() + +set(COIN_${NAME}_CHECKLEVEL "0" CACHE INTERNAL + "${NAME} check level") +set(COIN_${NAME}_VERBOSITY "0" CACHE INTERNAL + "${NAME} verbosity level") +configure_file(config.h.cmake.in config.h) +configure_file(config_cgl.h.cmake.in config_cgl.h) + +set(_SRCS + src/CglMixedIntegerRounding/CglMixedIntegerRoundingTest.cpp + src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp + src/CglDuplicateRow/CglDuplicateRow.cpp + src/CglCutGenerator.cpp + src/CglPreProcess/CglPreProcess.cpp + src/CglProbing/CglProbing.cpp + src/CglProbing/CglProbingTest.cpp + src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp + src/CglMixedIntegerRounding2/CglMixedIntegerRounding2Test.cpp + src/CglLandP/CglLandPUtils.cpp + src/CglLandP/CglLandPTest.cpp + src/CglLandP/CglLandPTabRow.cpp + src/CglLandP/CglLandPSimplex.cpp + src/CglLandP/CglLandPValidator.cpp + src/CglLandP/CglLandPMessages.cpp + src/CglLandP/CglLandP.cpp + src/CglOddHole/CglOddHoleTest.cpp + src/CglOddHole/CglOddHole.cpp + src/CglRedSplit/CglRedSplitParam.cpp + src/CglRedSplit/CglRedSplit.cpp + src/CglRedSplit/CglRedSplitTest.cpp + src/CglAllDifferent/CglAllDifferent.cpp + src/CglKnapsackCover/CglKnapsackCoverTest.cpp + src/CglKnapsackCover/CglKnapsackCover.cpp + src/CglSimpleRounding/CglSimpleRoundingTest.cpp + src/CglSimpleRounding/CglSimpleRounding.cpp + src/CglZeroHalf/CglZeroHalfTest.cpp + src/CglZeroHalf/Cgl012cut.cpp + src/CglZeroHalf/CglZeroHalf.cpp + src/CglRedSplit2/CglRedSplit2Test.cpp + src/CglRedSplit2/CglRedSplit2Param.cpp + src/CglRedSplit2/CglRedSplit2.cpp + src/CglMessage.cpp + src/CglStored.cpp + src/CglParam.cpp + src/CglResidualCapacity/CglResidualCapacity.cpp + src/CglResidualCapacity/CglResidualCapacityTest.cpp + src/CglTwomir/CglTwomirTest.cpp + src/CglTwomir/CglTwomir.cpp + src/CglFlowCover/CglFlowCoverTest.cpp + src/CglFlowCover/CglFlowCover.cpp + src/CglClique/CglCliqueHelper.cpp + src/CglClique/CglCliqueTest.cpp + src/CglClique/CglClique.cpp + src/CglTreeInfo.cpp + src/CglLiftAndProject/CglLiftAndProject.cpp + src/CglGomory/CglGomoryTest.cpp + src/CglGomory/CglGomory.cpp + src/CglGMI/CglGMI.cpp + src/CglGMI/CglGMIParam.cpp) + +set(_HDRS + src/CglConfig.h + src/CglMixedIntegerRounding/CglMixedIntegerRounding.hpp + src/CglDuplicateRow/CglDuplicateRow.hpp + src/CglStored.hpp + src/CglPreProcess/CglPreProcess.hpp + src/CglProbing/CglProbing.hpp + src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.hpp + src/CglLandP/CglLandP.hpp + src/CglLandP/CglLandPUtils.hpp + src/CglLandP/CglLandPValidator.hpp + src/CglLandP/CglLandPTabRow.hpp + src/CglLandP/CglLandPMessages.hpp + src/CglLandP/CglLandPSimplex.hpp + src/CglOddHole/CglOddHole.hpp + src/CglRedSplit/CglRedSplitParam.hpp + src/CglRedSplit/CglRedSplit.hpp + src/CglAllDifferent/CglAllDifferent.hpp + src/CglKnapsackCover/CglKnapsackCover.hpp + src/CglSimpleRounding/CglSimpleRounding.hpp + src/CglMessage.hpp + src/CglZeroHalf/CglZeroHalf.hpp + src/CglZeroHalf/Cgl012cut.hpp + src/CglRedSplit2/CglRedSplit2Param.hpp + src/CglRedSplit2/CglRedSplit2.hpp + src/CglCutGenerator.hpp + src/CglResidualCapacity/CglResidualCapacity.hpp + src/CglTwomir/CglTwomir.hpp + src/CglFlowCover/CglFlowCover.hpp + src/CglClique/CglClique.hpp + src/CglLiftAndProject/CglLiftAndProject.hpp + src/CglGomory/CglGomory.hpp + src/CglGMI/CglGMIParam.hpp + src/CglGMI/CglGMI.hpp + src/CglParam.hpp + src/CglTreeInfo.hpp) + +add_library(Cgl ${_SRCS} ${_HDRS}) +target_include_directories(Cgl PUBLIC + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $) +target_compile_definitions(Cgl + PUBLIC HAVE_CONFIG_H + PRIVATE CGL_BUILD) +if(CMAKE_VERSION VERSION_LESS "3.8.2") + set_property(TARGET Cgl PROPERTY CXX_STANDARD 11) + set_property(TARGET Cgl PROPERTY CXX_STANDARD_REQUIRED ON) +else() + target_compile_features(Cgl PUBLIC cxx_std_11) +endif() +target_link_libraries(Cgl PUBLIC + Coin::CoinUtils + Coin::Osi + Coin::OsiClp) +set_target_properties(Cgl PROPERTIES + PUBLIC_HEADER "${_HDRS};${CMAKE_CURRENT_BINARY_DIR}/config_cgl.h" + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}) +add_library(Coin::Cgl ALIAS Cgl) + +# Install +include(GNUInstallDirs) +install(TARGETS Cgl + EXPORT ${PROJECT_NAME}Targets + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) diff --git a/Cgl/config.h.cmake.in b/Cgl/config.h.cmake.in new file mode 100644 index 00000000..35329dcd --- /dev/null +++ b/Cgl/config.h.cmake.in @@ -0,0 +1,114 @@ +/*config.h. Generated by configure_file.*/ + +#define COIN_HAS_COINUTILS 1 +#define COIN_HAS_OSI 1 +#define COIN_HAS_OSICLP 1 + +/* VERSION */ +#define VERSION "${VERSION}" +/* ${NAME}_VERSION */ +#define ${NAME}_VERSION "${VERSION}" +/* ${NAME}_VERSION_MAJOR */ +#define ${NAME}_VERSION_MAJOR ${MAJOR} +/* ${NAME}_VERSION_MINOR */ +#define ${NAME}_VERSION_MINOR ${MINOR} +/* ${NAME}_VERSION_RELEASE */ +#define ${NAME}_VERSION_RELEASE ${PATCH} + +/* HAVE_MATH_H */ +#cmakedefine HAVE_MATH_H ${HAVE_MATH_H} +/* HAVE_CTYPE_H */ +#cmakedefine HAVE_CTYPE_H ${HAVE_CTYPE_H} +/* HAVE_INTTYPES_H */ +#cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} +/* HAVE_FLOAT_H */ +#cmakedefine HAVE_FLOAT_H ${HAVE_FLOAT_H} +/* HAVE_IEEEFP_H */ +#cmakedefine HAVE_IEEEFP_H ${HAVE_IEEEFP_H} +/* HAVE_STDARG_H */ +#cmakedefine HAVE_STDARG_H ${HAVE_STDARG_H} +/* HAVE_STDDEF_H */ +#cmakedefine HAVE_STDDEF_H ${HAVE_STDDEF_H} +/* HAVE_STDINT_H */ +#cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} +/* HAVE_STDIO_H */ +#cmakedefine HAVE_STDIO_H ${HAVE_STDIO_H} +/* HAVE_STDLIB_H */ +#cmakedefine HAVE_STDLIB_H ${HAVE_STDLIB_H} +/* HAVE_ASSERT_H */ +#cmakedefine HAVE_ASSERT_H ${HAVE_ASSERT_H} +/* HAVE_DLFCN_H */ +#cmakedefine HAVE_DLFCN_H ${HAVE_DLFCN_H} +/* HAVE_ENDIAN_H */ +#cmakedefine HAVE_ENDIAN_H ${HAVE_ENDIAN_H} +/* HAVE_MEMORY_H */ +#cmakedefine HAVE_MEMORY_H ${HAVE_MEMORY_H} +/* HAVE_STRINGS_H */ +#cmakedefine HAVE_STRINGS_H ${HAVE_STRINGS_H} +/* HAVE_STRING_H */ +#cmakedefine HAVE_STRING_H ${HAVE_STRING_H} +/* HAVE_TIME_H */ +#cmakedefine HAVE_TIME_H ${HAVE_TIME_H} +/* HAVE_UNISTD_H */ +#cmakedefine HAVE_UNISTD_H ${HAVE_UNISTD_H} +/* HAVE_SYS_STAT_H */ +#cmakedefine HAVE_SYS_STAT_H ${HAVE_SYS_STAT_H} +/* HAVE_SYS_TYPES_H */ +#cmakedefine HAVE_SYS_TYPES_H ${HAVE_SYS_TYPES_H} + +/* HAVE_CMATH */ +#cmakedefine HAVE_CMATH ${HAVE_CMATH} +/* HAVE_CCTYPE */ +#cmakedefine HAVE_CCTYPE ${HAVE_CCTYPE} +/* HAVE_CINTTYPES */ +#cmakedefine HAVE_CINTTYPES ${HAVE_CINTTYPES} +/* HAVE_CFLOAT */ +#cmakedefine HAVE_CFLOAT ${HAVE_CFLOAT} +/* HAVE_CIEEEFP */ +#cmakedefine HAVE_CIEEEFP ${HAVE_CIEEEFP} +/* HAVE_CSTDARG */ +#cmakedefine HAVE_CSTDARG ${HAVE_CSTDARG} +/* HAVE_CSTDDEF */ +#cmakedefine HAVE_CSTDDEF ${HAVE_CSTDDEF} +/* HAVE_CSTDINT */ +#cmakedefine HAVE_CSTDINT ${HAVE_CSTDINT} +/* HAVE_CSTDIO */ +#cmakedefine HAVE_CSTDIO ${HAVE_CSTDIO} +/* HAVE_CSTDLIB */ +#cmakedefine HAVE_CSTDLIB ${HAVE_CSTDLIB} +/* HAVE_CASSERT */ +#cmakedefine HAVE_CASSERT ${HAVE_CASSERT} +/* HAVE_CSTRING */ +#cmakedefine HAVE_CSTRING ${HAVE_CSTRING} +/* HAVE_CTIME */ +#cmakedefine HAVE_CTIME ${HAVE_CTIME} + +/* COIN_C_FINITE */ +#cmakedefine COIN_C_FINITE ${COIN_C_FINITE} +/* COIN_C_ISNAN */ +#cmakedefine COIN_C_ISNAN ${COIN_C_ISNAN} +/* COIN_INT64_T */ +#cmakedefine COIN_INT64_T ${COIN_INT64_T} +/* COIN_UINT64_T */ +#cmakedefine COIN_UINT64_T ${COIN_UINT64_T} +/* COIN_INTPTR_T */ +#cmakedefine COIN_INTPTR_T ${COIN_INTPTR_T} + +/* COIN_${NAME}_CHECKLEVEL */ +#define COIN_${NAME}_CHECKLEVEL ${COIN_${NAME}_CHECKLEVEL} +/* COIN_${NAME}_VERBOSITY */ +#define COIN_${NAME}_VERBOSITY ${COIN_${NAME}_VERBOSITY} + +/* PACKAGE */ +#cmakedefine PACKAGE +/* PACKAGE_NAME */ +#cmakedefine PACKAGE_NAME +/* PACKAGE_VERSION */ +#cmakedefine PACKAGE_VERSION +/* PACKAGE_STRING */ +#cmakedefine PACKAGE_STRING +/* PACKAGE_TARNAME */ +#cmakedefine PACKAGE_TARNAME +/* PACKAGE_BUGREPORT */ +#cmakedefine PACKAGE_BUGREPORT + diff --git a/Cgl/config_cgl.h.cmake.in b/Cgl/config_cgl.h.cmake.in new file mode 100644 index 00000000..8dc44bf9 --- /dev/null +++ b/Cgl/config_cgl.h.cmake.in @@ -0,0 +1,13 @@ +#ifndef __CONFIG_${NAME}_H__ +#define __CONFIG_${NAME}_H__ + +/* ${NAME}_VERSION */ +#define ${NAME}_VERSION "${VERSION}" +/* ${NAME}_VERSION_MAJOR */ +#define ${NAME}_VERSION_MAJOR ${MAJOR} +/* ${NAME}_VERSION_MINOR */ +#define ${NAME}_VERSION_MINOR ${MINOR} +/* ${NAME}_VERSION_RELEASE */ +#define ${NAME}_VERSION_RELEASE ${PATCH} + +#endif diff --git a/cmake/CheckEnv.cmake b/cmake/CheckEnv.cmake new file mode 100644 index 00000000..b2477025 --- /dev/null +++ b/cmake/CheckEnv.cmake @@ -0,0 +1,151 @@ +# Flags +include (CheckIncludeFile) +check_include_file(math.h HAVE_MATH_H) +check_include_file(ctype.h HAVE_CTYPE_H) +check_include_file(inttypes.h HAVE_INTTYPES_H) +check_include_file(float.h HAVE_FLOAT_H) +check_include_file(ieeefp.h HAVE_IEEEFP_H) +check_include_file(stdarg.h HAVE_STDARG_H) +check_include_file(stddef.h HAVE_STDDEF_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stdio.h HAVE_STDIO_H) +check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(assert.h HAVE_ASSERT_H) +check_include_file(dlfcn.h HAVE_DLFCN_H) +check_include_file(endian.h HAVE_ENDIAN_H) +check_include_file(memory.h HAVE_MEMORY_H) +check_include_file(strings.h HAVE_STRINGS_H) +check_include_file(string.h HAVE_STRING_H) +check_include_file(time.h HAVE_TIME_H) +check_include_file(unistd.h HAVE_UNISTD_H) +check_include_file(sys/stat.h HAVE_SYS_STAT_H) +check_include_file(sys/types.h HAVE_SYS_TYPES_H) + +include (CheckIncludeFileCXX) +check_include_file_cxx(cmath HAVE_CMATH) +check_include_file_cxx(cctype HAVE_CCTYPE) +check_include_file_cxx(cinttypes HAVE_CINTTYPES) +check_include_file_cxx(cfloat HAVE_CFLOAT) +check_include_file_cxx(cieeefp HAVE_CIEEEFP) +check_include_file_cxx(cstdarg HAVE_CSTDARG) +check_include_file_cxx(cstddef HAVE_CSTDDEF) +check_include_file_cxx(cstdint HAVE_CSTDINT) +check_include_file_cxx(cstdio HAVE_CSTDIO) +check_include_file_cxx(cstdlib HAVE_CSTDLIB) +check_include_file_cxx(cassert HAVE_CASSERT) +check_include_file_cxx(cstring HAVE_CSTRING) +check_include_file_cxx(ctime HAVE_CTIME) + +set(STDC_HEADERS 1 CACHE INTERNAL "System has ANSI C header files") + +set(TEST_INCLUDES "") +if(HAVE_CMATH) + list(APPEND TEST_INCLUDES "cmath") +endif() +if(HAVE_CFLOAT) + list(APPEND TEST_INCLUDES "cfloat") +endif() +if(HAVE_CIEEEFP) + list(APPEND TEST_INCLUDES "cieeefp") +endif() +if(HAVE_MATH_H) + list(APPEND TEST_INCLUDES "math.h") +endif() +if(HAVE_FLOAT_H) + list(APPEND TEST_INCLUDES "float.h") +endif() +if(HAVE_IEEEFP_H) + list(APPEND TEST_INCLUDES "ieeefp.h") +endif() + +# ISFINITE +include(CheckCXXSourceCompiles) +check_cxx_source_compiles( + "#include \nint main(){return std::isfinite(0);}" + HAVE_STD_ISFINITE) +include(CheckFunctionExists) +include(CheckCXXSymbolExists) +check_cxx_symbol_exists(isfinite "${TEST_INCLUDES}" HAVE_ISFINITE) +check_cxx_symbol_exists(finite "${TEST_INCLUDES}" HAVE_FINITE) +check_cxx_symbol_exists(_finite "${TEST_INCLUDES}" HAVE__FINITE) +check_cxx_symbol_exists(__finite "${TEST_INCLUDES}" HAVE___FINITE) +if(HAVE_STD_ISFINITE) + set(COIN_C_FINITE "std::isfinite") +elseif(HAVE_ISFINITE) + set(COIN_C_FINITE "isfinite") +elseif(HAVE_FINITE) + set(COIN_C_FINITE "finite") +elseif(HAVE__FINITE) + set(COIN_C_FINITE "_finite") +elseif(HAVE___FINITE) + set(COIN_C_FINITE "__finite") +else() + message(FATAL_ERROR "Can't find isfinite()") +endif() +message(STATUS "Found isfinite: ${COIN_C_FINITE}") + +# ISNAN +include(CheckCXXSourceCompiles) +check_cxx_source_compiles( + "#include \nint main(){return std::isnan(0);}" + HAVE_STD_ISNAN) +include(CheckFunctionExists) +include(CheckCXXSymbolExists) +check_cxx_symbol_exists(isnan "${TEST_INCLUDES}" HAVE_ISNAN) +check_cxx_symbol_exists(_isnan "${TEST_INCLUDES}" HAVE__ISNAN) +check_cxx_symbol_exists(__isnan "${TEST_INCLUDES}" HAVE___ISNAN) +if(HAVE_STD_ISNAN) + set(COIN_C_ISNAN "std::isnan") +elseif(HAVE_ISNAN) + set(COIN_C_ISNAN "isnan") +elseif(HAVE__ISNAN) + set(COIN_C_ISNAN "_isnan") +elseif(HAVE___ISNAN) + set(COIN_C_ISNAN "__isnan") +else() + message(FATAL_ERROR "Can't find isnan()") +endif() +message(STATUS "Found isnan: ${COIN_C_ISNAN}") + +# Basic type +include(CheckTypeSize) +check_type_size("int64_t" SIZEOF_INT64_T) +check_type_size("long long" SIZEOF_LONG_LONG) +check_type_size("long" SIZEOF_LONG) +check_type_size("uint64_t" SIZEOF_UINT64_T) +check_type_size("unsigned long long" SIZEOF_ULONG_LONG) +check_type_size("unsigned long" SIZEOF_ULONG) +check_type_size("intptr_t" SIZEOF_INTPTR_T) +check_type_size("int *" SIZEOF_INT_P) + +if(SIZEOF_INT64_T EQUAL "8") + set(COIN_INT64_T "int64_t") +elseif(SIZEOF_LONG EQUAL "8") + set(COIN_INT64_T "long") +elseif(SIZEOF_LONG_LONG EQUAL "8") + set(COIN_INT64_T "long long") +else() + message(FATAL_ERROR "Can't find suitable int64_t") +endif() +message(STATUS "Found int64_t: ${COIN_INT64_T}") + +if(SIZEOF_UINT64_T EQUAL "8") + set(COIN_UINT64_T "uint64_t") +elseif(SIZEOF_ULONG EQUAL "8") + set(COIN_INT64_T "unsigned long") +elseif(SIZEOF_ULONG_LONG EQUAL "8") + set(COIN_INT64_T "unsigned long long") +else() + message(FATAL_ERROR "Can't find suitable uint64_t") +endif() +message(STATUS "Found uint64_t: ${COIN_UINT64_T}") + +if(SIZEOF_INTPTR_T) + set(COIN_INTPTR_T "intptr_t") +elseif(SIZEOF_INT_P) + set(COIN_INTPTR_T "int *") +else() + message(FATAL_ERROR "Can't find suitable intptr_t") +endif() +message(STATUS "Found intptr_t: ${COIN_INTPTR_T}") + diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in new file mode 100644 index 00000000..313f4988 --- /dev/null +++ b/cmake/Config.cmake.in @@ -0,0 +1,19 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if(@ZLIB_FOUND@) + find_dependency(ZLIB REQUIRED) +endif() + +if(@PTHREADS_FOUND@) + find_dependency(Threads REQUIRED) +endif() + +if(${CMAKE_VERSION} VERSION_LESS "3.9.6") + find_dependency(Clp REQUIRED) +else() + find_dependency(Clp REQUIRED CONFIG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/cmake/ParseAc.cmake b/cmake/ParseAc.cmake new file mode 100644 index 00000000..55057d44 --- /dev/null +++ b/cmake/ParseAc.cmake @@ -0,0 +1,28 @@ +function(parse_ac VERSION_STRING VERSION_MAJOR VERSION_MINOR VERSION_PATCH) + file(READ "configure.ac" IN) + if(IN MATCHES "AC_INIT\\(.*trunk.*\\)") + message(WARNING "using trunk...") + set(MAJOR 999) + set(MINOR 0) + set(PATCH 0) + else() + # AC_INIT([Cgl],[major.minor.patch or trunk],[url or email]) + string(REGEX MATCH + "AC_INIT\\([^,]+,\\[([0-9]+)\\.([0-9]+)(\\.([0-9]+))?\\],[^\\)]+\\)" AC_INIT ${IN}) + message(STATUS "AC_INIT: ${AC_INIT}") + set(MAJOR ${CMAKE_MATCH_1}) + set(MINOR ${CMAKE_MATCH_2}) + if(CMAKE_MATCH_3) + set(PATCH ${CMAKE_MATCH_4}) + else() + set(PATCH 0) + endif() + endif() + set(VERSION "${MAJOR}.${MINOR}.${PATCH}") + + set(${VERSION_MAJOR} ${MAJOR} PARENT_SCOPE) + set(${VERSION_MINOR} ${MINOR} PARENT_SCOPE) + set(${VERSION_PATCH} ${PATCH} PARENT_SCOPE) + set(${VERSION_STRING} ${VERSION} PARENT_SCOPE) + message(STATUS "version: ${VERSION}") +endfunction() From 59d95fba6605329d615d44ac7be0be2397210d5a Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 3 Apr 2019 14:03:57 +0200 Subject: [PATCH 3/3] Add CMake CI --- .dockerignore | 21 +++++ ci/Makefile | 142 +++++++++++++++++++++++++++++++++ ci/docker/alpine/Dockerfile | 61 ++++++++++++++ ci/docker/archlinux/Dockerfile | 61 ++++++++++++++ ci/docker/centos/Dockerfile | 67 ++++++++++++++++ ci/docker/debian/Dockerfile | 64 +++++++++++++++ ci/docker/fedora/Dockerfile | 64 +++++++++++++++ ci/docker/opensuse/Dockerfile | 64 +++++++++++++++ ci/docker/ubuntu/Dockerfile | 64 +++++++++++++++ ci/sample/CMakeLists.txt | 22 +++++ ci/sample/main.cpp | 12 +++ 11 files changed, 642 insertions(+) create mode 100644 .dockerignore create mode 100644 ci/Makefile create mode 100644 ci/docker/alpine/Dockerfile create mode 100644 ci/docker/archlinux/Dockerfile create mode 100644 ci/docker/centos/Dockerfile create mode 100644 ci/docker/debian/Dockerfile create mode 100644 ci/docker/fedora/Dockerfile create mode 100644 ci/docker/opensuse/Dockerfile create mode 100644 ci/docker/ubuntu/Dockerfile create mode 100644 ci/sample/CMakeLists.txt create mode 100644 ci/sample/main.cpp diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..cbad1428 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,21 @@ +# Project Files unneeded by docker +ci/cache +ci/docker +.git +.gitignore +.github +.dockerignore +.travis.yml +.clang-format +AUTHORS +INSTALL +install-sh +missing +README +README.md + +build/ + +# Editor directories and files +*.user +*.swp diff --git a/ci/Makefile b/ci/Makefile new file mode 100644 index 00000000..3d70e0b6 --- /dev/null +++ b/ci/Makefile @@ -0,0 +1,142 @@ +PROJECT := cgl +BRANCH := $(shell git rev-parse --abbrev-ref HEAD) +SHA1 := $(shell git rev-parse --verify HEAD) + +# General commands +.PHONY: help +BOLD=\e[1m +RESET=\e[0m + +help: + @echo -e "${BOLD}SYNOPSIS${RESET}" + @echo -e "\tmake [NOCACHE=1]" + @echo + @echo -e "${BOLD}DESCRIPTION${RESET}" + @echo -e "\ttest build inside docker container to have a reproductible build." + @echo + @echo -e "${BOLD}MAKE TARGETS${RESET}" + @echo -e "\t${BOLD}help${RESET}: display this help and exit." + @echo + @echo -e "\t${BOLD}${RESET}: build docker images for ALL DISTROS." + @echo -e "\t${BOLD}_${RESET}: build docker image for a specific distro." + @echo -e "\t${BOLD}save_${RESET}: Save docker images for ALL DISTROS." + @echo -e "\t${BOLD}save__${RESET}: Save the docker image for a specific distro." + @echo -e "\t${BOLD}sh__${RESET}: run a container using the docker image specified (debug purpose)." + @echo + @echo -e "\tWith ${BOLD}${RESET}:" + @echo -e "\t\t${BOLD}env${RESET}" + @echo -e "\t\t${BOLD}devel${RESET}" + @echo -e "\t\t${BOLD}build${RESET}" + @echo -e "\t\t${BOLD}test${RESET}" + @echo -e "\t\t${BOLD}install_env${RESET}" + @echo -e "\t\t${BOLD}install_devel${RESET}" + @echo -e "\t\t${BOLD}install_build${RESET}" + @echo -e "\t\t${BOLD}install_test${RESET}" + @echo -e "\te.g. 'make build'" + @echo + @echo -e "\tWith ${BOLD}${RESET}:" + @echo -e "\t\t${BOLD}alpine${RESET} (edge)" + @echo -e "\t\t${BOLD}archlinux${RESET} (latest)" + @echo -e "\t\t${BOLD}centos${RESET} (latest)" + @echo -e "\t\t${BOLD}debian${RESET} (latest)" + @echo -e "\t\t${BOLD}fedora${RESET} (latest)" + @echo -e "\t\t${BOLD}opensuse${RESET} (leap)" + @echo -e "\t\t${BOLD}ubuntu${RESET} (latest)" + @echo -e "\te.g. 'make ubuntu_test'" + @echo + @echo -e "\t${BOLD}clean${RESET}: Remove cache and ALL docker images." + @echo -e "\t${BOLD}clean_${RESET}: Remove cache and docker images for the specified distro." + @echo -e "\t${BOLD}clean_${RESET}: Remove virtual machine for the specified vm." + @echo + @echo -e "\t${BOLD}NOCACHE=1${RESET}: use 'docker build --no-cache' when building container (default use cache)." + @echo + @echo -e "branch: $(BRANCH)" + @echo -e "sha1: $(SHA1)" + +# Need to add cmd_distro to PHONY otherwise target are ignored since they do not +# contain recipe (using FORCE do not work here) +.PHONY: all +all: build + +# Delete all implicit rules to speed up makefile +MAKEFLAGS += --no-builtin-rules +.SUFFIXES: +# Remove some rules from gmake that .SUFFIXES does not remove. +SUFFIXES = +# Keep all intermediate files +# ToDo: try to remove it later +.SECONDARY: + +# Docker image name prefix. +IMAGE := ${PROJECT} + +ifdef NOCACHE +DOCKER_BUILD_CMD := docker build --no-cache +else +DOCKER_BUILD_CMD := docker build +endif + +DOCKER_RUN_CMD := docker run --rm --init --net=host + +# Currently supported distro +DISTROS = alpine archlinux centos debian fedora opensuse ubuntu + +# $* stem +# $< first prerequist +# $@ target name + +############ +## STAGES ## +############ +STAGES = env devel build test install_env install_devel install_build install_test +define make-stage-target = +#$$(info STAGE: $1) +#$$(info Create targets: $1 $(addsuffix _$1, $(DISTROS)).) +targets_$1 = $(addsuffix _$1, $(DISTROS)) +.PHONY: $1 $$(targets_$1) +$1: $$(targets_$1) +$$(targets_$1): %_$1: docker/%/Dockerfile + #@docker image rm -f ${IMAGE}:$$*_$1 2>/dev/null + ${DOCKER_BUILD_CMD} --target=$1 --tag ${IMAGE}:$$*_$1 -f $$< .. + +#$$(info Create targets: save_$1 $(addprefix save_, $(addsuffix _$1, $(DISTROS))) (debug).) +save_targets_$1 = $(addprefix save_, $(addsuffix _$1, $(DISTROS))) +.PHONY: save_$1 $$(save_targets_$1) +save_$1: $$(save_targets_$1) +$$(save_targets_$1): save_%_$1: cache/%/docker_$1.tar +cache/%/docker_$1.tar: %_$1 + @rm -f $$@ + mkdir -p cache/$$* + docker save ${IMAGE}:$$*_$1 -o $$@ + +#$$(info Create targets: $(addprefix sh_, $(addsuffix _$1, $(DISTROS))) (debug).) +sh_targets_$1 = $(addprefix sh_, $(addsuffix _$1, $(DISTROS))) +.PHONY: $$(sh_targets_$1) +$$(sh_targets_$1): sh_%_$1: %_$1 + ${DOCKER_RUN_CMD} -it --name ${IMAGE}_$$*_$1 ${IMAGE}:$$*_$1 + +#$$(info Create targets: $(addprefix clean_, $(addsuffix _$1, $(DISTROS))).) +clean_targets_$1 = $(addprefix clean_, $(addsuffix _$1, $(DISTROS))) +.PHONY: clean_$1 $$(clean_targets_$1) +clean_$1: $$(clean_targets_$1) +$$(clean_targets_$1): clean_%_$1: + docker image rm -f ${IMAGE}:$$*_$1 2>/dev/null + rm -f cache/$$*/docker_$1.tar +endef + +$(foreach stage,$(STAGES),$(eval $(call make-stage-target,$(stage)))) + +## CLEAN ## +clean_targets = $(addprefix clean_, $(DISTROS)) +.PHONY: clean $(clean_targets) +clean: $(clean_targets) + docker container prune -f + docker image prune -f + -rmdir cache +$(clean_targets): clean_%: $(addprefix clean_%_, $(STAGES)) + -rmdir cache/$* + +.PHONY: distclean +distclean: clean + -docker container rm -f $$(docker container ls -aq) + -docker image rm -f $$(docker image ls -aq) diff --git a/ci/docker/alpine/Dockerfile b/ci/docker/alpine/Dockerfile new file mode 100644 index 00000000..8cd48d20 --- /dev/null +++ b/ci/docker/alpine/Dockerfile @@ -0,0 +1,61 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/alpine +FROM alpine:edge AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN apk add --no-cache git build-base linux-headers cmake + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/archlinux/Dockerfile b/ci/docker/archlinux/Dockerfile new file mode 100644 index 00000000..b930cec9 --- /dev/null +++ b/ci/docker/archlinux/Dockerfile @@ -0,0 +1,61 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/archlinux/ +FROM archlinux:latest AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN pacman -Syu --noconfirm base-devel git cmake + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/centos/Dockerfile b/ci/docker/centos/Dockerfile new file mode 100644 index 00000000..69e637d0 --- /dev/null +++ b/ci/docker/centos/Dockerfile @@ -0,0 +1,67 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/centos +FROM centos:latest AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN yum -y update \ +&& yum -y groupinstall "Development Tools" \ +&& yum -y install epel-release \ +&& yum -y install cmake3 \ +&& ln -s /usr/bin/cmake3 /usr/local/bin/cmake \ +&& yum clean all \ +&& rm -rf /var/cache/yum + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/debian/Dockerfile b/ci/docker/debian/Dockerfile new file mode 100644 index 00000000..1b2b6839 --- /dev/null +++ b/ci/docker/debian/Dockerfile @@ -0,0 +1,64 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/debian +FROM debian:latest AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN apt-get update -q \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git build-essential cmake \ +&& apt-get clean \ +&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/fedora/Dockerfile b/ci/docker/fedora/Dockerfile new file mode 100644 index 00000000..57c09056 --- /dev/null +++ b/ci/docker/fedora/Dockerfile @@ -0,0 +1,64 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/fedora +FROM fedora:latest AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN dnf -y update \ +&& dnf -y groupinstall "Development Tools" \ +&& dnf -y install cmake gcc-c++ \ +&& dnf clean all + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/opensuse/Dockerfile b/ci/docker/opensuse/Dockerfile new file mode 100644 index 00000000..9982c282 --- /dev/null +++ b/ci/docker/opensuse/Dockerfile @@ -0,0 +1,64 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/r/opensuse/tumbleweed +FROM opensuse/leap AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN zypper up -y \ +&& zypper install -y gcc gcc-c++ cmake git \ +&& zypper clean -a +ENV CC=gcc CXX=g++ + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/docker/ubuntu/Dockerfile b/ci/docker/ubuntu/Dockerfile new file mode 100644 index 00000000..fb475c8d --- /dev/null +++ b/ci/docker/ubuntu/Dockerfile @@ -0,0 +1,64 @@ +# Create a virtual environment with all tools installed +# ref: https://hub.docker.com/_/ubuntu +FROM ubuntu:latest AS env +LABEL maintainer="corentinl@google.com" +# Install system build dependencies +ENV PATH=$PATH:/usr/local/bin +RUN apt-get update -q \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git build-essential cmake \ +&& apt-get clean \ +&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN cd /tmp \ +&& git clone -b stable/2.11 https://github.com/Mizux/CoinUtils.git \ +&& cd CoinUtils \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf CoinUtils + +RUN cd /tmp \ +&& git clone -b stable/0.108 https://github.com/Mizux/Osi.git \ +&& cd Osi \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Osi + +RUN cd /tmp \ +&& git clone -b stable/1.17 https://github.com/Mizux/Clp.git \ +&& cd Clp \ +&& cmake -S. -Bbuild \ +&& cmake --build build --target install \ +&& cd .. \ +&& rm -rf Clp + +# Add the library src to our build env +FROM env AS devel +WORKDIR /home/project +COPY . . + +FROM devel AS build +RUN cmake --version +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v +RUN cmake --build build --target install -v + +FROM build AS test +RUN cmake --build build --target test -v + +# Test install rules +FROM env AS install_env +COPY --from=build /usr/local /usr/local/ + +FROM install_env AS install_devel +WORKDIR /home/sample +COPY ci/sample . + +FROM install_devel AS install_build +RUN cmake -S. -Bbuild +RUN cmake --build build --target all -v + +FROM install_build AS install_test +RUN cmake --build build --target test -v + diff --git a/ci/sample/CMakeLists.txt b/ci/sample/CMakeLists.txt new file mode 100644 index 00000000..2c6e0a62 --- /dev/null +++ b/ci/sample/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.5) +project(Sample VERSION 1.0.0 LANGUAGES CXX) + +include(CTest) +find_package(Cgl REQUIRED) + +add_executable(sample main.cpp) +#target_compile_features(sample PUBLIC cxx_std_11) +set_target_properties(sample PROPERTIES + CXX_STANDARD 11 + CXX_STANDARD_REQUIRED ON + VERSION ${PROJECT_VERSION}) +target_link_libraries(sample PRIVATE Coin::Cgl) + +if(BUILD_TESTING) + add_test(NAME sample_UT COMMAND sample) +endif() + +include(GNUInstallDirs) +install(TARGETS sample + EXPORT SampleTargets + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/ci/sample/main.cpp b/ci/sample/main.cpp new file mode 100644 index 00000000..a252f657 --- /dev/null +++ b/ci/sample/main.cpp @@ -0,0 +1,12 @@ +#include +#include +#include +#include + +int main(int argc, char** argv) { + std::cout << "coinutils version: " << COINUTILS_VERSION << std::endl; + std::cout << "osi version: " << OSI_VERSION << std::endl; + std::cout << "cgl version: " << CGL_VERSION << std::endl; + return 0; +} +