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

2021-07-05 19:10:59 +02:00
parent fb2ef5fc1a 1757c35e12
commit afcb9e2ae5
2 changed files with 2 additions and 2 deletions
--- a/bazel/scip.BUILD
+++ b/bazel/scip.BUILD
@@ -37,7 +37,7 @@ cc_library(
        "-DSCIP_WITH_ZLIB",
        "-DWITH_SCIPDEF",
        "-DSCIP_ROUNDING_FE",
-        "-DTPI_TNYC",  # src/tpi/tpi_type_tny.h
+        "-DTPI_TNYC",  # src/tpi/type_tpi_tnycthrd.h
        "-DSYM=bliss",
        # Compile in thead-safe mode (required since we use TPI_TNYC). Note,
        # one does not technically need to add this, as SCIP code always
--- a/cmake/dotnet.cmake
+++ b/cmake/dotnet.cmake
@@ -20,7 +20,7 @@ if(UNIX AND NOT APPLE)
 endif()

 # Setup Dotnet
-find_program (DOTNET_EXECUTABLE NAMES dotnet)
+find_program(DOTNET_EXECUTABLE NAMES dotnet)
 if(NOT DOTNET_EXECUTABLE)
  message(FATAL_ERROR "Check for dotnet Program: not found")
 else()