always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/google/or-tools

Browse Source
This commit is contained in:
Laurent Perron
2018-02-12 17:25:57 +01:00
parent 59a48e24a9 6a9403a547
commit 0ac134dcc6
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/external/cbc.CMakeLists.txt vendored
View File

@@ -13,7 +13,7 @@ ExternalProject_Add(cbc_project
SOURCE_DIR "${CMAKE_BINARY_DIR}/cbc-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/cbc-build"
UPDATE_COMMAND ""
#PATCH_COMMAND git apply "${CMAKE_SOURCE_DIR}/patches/cbc.patch"
#PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/cbc.patch"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""

2
cmake/external/gflags.CMakeLists.txt vendored
View File

@@ -13,7 +13,7 @@ ExternalProject_Add(gflags_project
SOURCE_DIR "${CMAKE_BINARY_DIR}/gflags-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/gflags-build"
UPDATE_COMMAND ""
PATCH_COMMAND git apply "${CMAKE_SOURCE_DIR}/patches/gflags.patch"
PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/gflags.patch"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""

4
cmake/external/glog.CMakeLists.txt vendored
View File

@@ -9,12 +9,12 @@ project(glog-download NONE)
include(ExternalProject)
ExternalProject_Add(glog_project
GIT_REPOSITORY https://github.com/google/glog
GIT_TAG "master"
GIT_TAG "55cc27b6eca3d7906fc1a920ca95df7717deb4e7"
#GIT_TAG "v0.3.5"
SOURCE_DIR "${CMAKE_BINARY_DIR}/glog-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/glog-build"
UPDATE_COMMAND ""
PATCH_COMMAND git apply "${CMAKE_SOURCE_DIR}/patches/glog.patch"
PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/glog.patch"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""

2
cmake/external/protobuf.CMakeLists.txt vendored
View File

@@ -13,7 +13,7 @@ ExternalProject_Add(protobuf_project
SOURCE_DIR "${CMAKE_BINARY_DIR}/protobuf-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/protobuf-build"
UPDATE_COMMAND ""
PATCH_COMMAND git apply "${CMAKE_SOURCE_DIR}/patches/protobuf.patch"
PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/protobuf.patch"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""

2
cmake/external/zlib.CMakeLists.txt vendored
View File

@@ -13,7 +13,7 @@ ExternalProject_Add(zlib_project
SOURCE_DIR "${CMAKE_BINARY_DIR}/zlib-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/zlib-build"
UPDATE_COMMAND ""
PATCH_COMMAND patch < "${CMAKE_SOURCE_DIR}/patches/zlib.patch"
PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/zlib.patch"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""