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

google · Nov 1, 2023 · b86f38d · b86f38d
2 parents a4a4704 + 0f86407
commit b86f38d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cmake/docker/glop/Dockerfile b/cmake/docker/glop/Dockerfile
@@ -7,11 +7,11 @@ RUN apt-get update -qq \
 && apt-get install -yq git wget libssl-dev build-essential \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-# Install CMake 3.25.2
-RUN wget -q "https://cmake.org/files/v3.25/cmake-3.25.2-linux-x86_64.sh" \
-&& chmod a+x cmake-3.25.2-linux-x86_64.sh \
-&& ./cmake-3.25.2-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
-&& rm cmake-3.25.2-linux-x86_64.sh
+# Install CMake 3.27.7
+RUN wget -q "https://cmake.org/files/v3.27/cmake-3.27.7-linux-x86_64.sh" \
+&& chmod a+x cmake-3.27.7-linux-x86_64.sh \
+&& ./cmake-3.27.7-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
+&& rm cmake-3.27.7-linux-x86_64.sh
 CMD [ "/usr/bin/bash" ]
 
 FROM env AS devel

diff --git a/cmake/glop.cmake b/cmake/glop.cmake
@@ -79,16 +79,23 @@ target_link_libraries(glop_proto PRIVATE protobuf::libprotobuf)
 # Main Target
 add_library(glop)
 target_sources(glop PRIVATE
+  ortools/base/accurate_sum.h
+  ortools/base/basictypes.h
   ortools/base/commandlineflags.h
   ortools/base/file.cc
   ortools/base/file.h
   ortools/base/gzipstring.h
+  ortools/base/hash.h
+  ortools/base/int_type.h
   ortools/base/logging.h
   ortools/base/macros.h
   ortools/base/sysinfo.cc
   ortools/base/sysinfo.h
+  ortools/base/timer.h
+  ortools/base/types.h
   ortools/base/version.cc
   ortools/base/version.h
+  ortools/base/vlog.h
   ortools/base/vlog_is_on.cc
   ortools/base/vlog_is_on.h
   ortools/glop/basis_representation.cc
@@ -299,15 +306,19 @@ install(FILES
   ortools/base/basictypes.h
   ortools/base/commandlineflags.h
   ortools/base/file.h
+  ortools/base/gzipstring.h
   ortools/base/hash.h
   ortools/base/int_type.h
-  ortools/base/strong_int.h
-  ortools/base/strong_vector.h
   ortools/base/logging.h
   ortools/base/macros.h
   ortools/base/recordio.h
+  ortools/base/strong_int.h
+  ortools/base/strong_vector.h
   ortools/base/sysinfo.h
   ortools/base/timer.h
+  ortools/base/types.h
+  ortools/base/version.h
+  ortools/base/vlog.h
   ortools/base/vlog_is_on.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ortools/base
   COMPONENT Devel)