From 92b17b8fd2a34cc048e6a77266f3d78067dc2cbf Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 24 Mar 2025 13:37:42 +0100
Subject: [PATCH] cmake: make re2 a mandatory dependency

---
 CMakeLists.txt          | 8 ++------
 cmake/check_deps.cmake  | 8 +++-----
 cmake/system_deps.cmake | 6 ++----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6165c7f086..bba9295288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,12 +188,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_Eigen3 "Build the eigen3 dependency Library" OFF
   "NOT BUILD_DEPS" ON)
 message(STATUS "Build eigen3: ${BUILD_Eigen3}")
 
-if(BUILD_LP_PARSER OR BUILD_TESTING)
-  CMAKE_DEPENDENT_OPTION(BUILD_re2 "Build the re2 dependency Library" OFF
-    "NOT BUILD_DEPS" ON)
-else()
-  set(BUILD_re2 OFF)
-endif()
+CMAKE_DEPENDENT_OPTION(BUILD_re2 "Build the re2 dependency Library" OFF
+  "NOT BUILD_DEPS" ON)
 message(STATUS "Build re2: ${BUILD_re2}")
 
 if(BUILD_TESTING)
diff --git a/cmake/check_deps.cmake b/cmake/check_deps.cmake
index 60cbb2e0cf..8d96ecbbe4 100644
--- a/cmake/check_deps.cmake
+++ b/cmake/check_deps.cmake
@@ -62,12 +62,10 @@ if(NOT TARGET Eigen3::Eigen)
   message(FATAL_ERROR "Target Eigen3::Eigen not available.")
 endif()
 
-if(BUILD_LP_PARSER OR BUILD_TESTING)
-  if(NOT TARGET re2::re2)
-    message(FATAL_ERROR "Target re2::re2 not available.")
-  endif()
-  set(RE2_DEPS re2::re2)
+if(NOT TARGET re2::re2)
+  message(FATAL_ERROR "Target re2::re2 not available.")
 endif()
+set(RE2_DEPS re2::re2)
 
 if(USE_COINOR)
   if(NOT TARGET Coin::CbcSolver)
diff --git a/cmake/system_deps.cmake b/cmake/system_deps.cmake
index 12be1d4b2e..c1c65fc656 100644
--- a/cmake/system_deps.cmake
+++ b/cmake/system_deps.cmake
@@ -38,10 +38,8 @@ if(NOT BUILD_Eigen3)
   find_package(Eigen3 REQUIRED)
 endif()
 
-if(BUILD_LP_PARSER OR BUILD_TESTING)
-  if(NOT BUILD_re2)
-    find_package(re2 REQUIRED)
-  endif()
+if(NOT BUILD_re2 AND NOT TARGET re2::re2)
+  find_package(re2 REQUIRED)
 endif()
 
 if(USE_COINOR)