revert CCCL header path fixes and protobuf aliasing

Signed-off-by: Trevor McKay <tmgithub1@gmail.com>

Author: tmckayus

cpp/CMakeLists.txt

@@ -430,17 +430,6 @@ if(WRITE_FATBIN)
   target_link_options(cuopt PRIVATE "${CUOPT_BINARY_DIR}/fatbin.ld")
 endif()
 
-# Prefer the RAPIDS-provided CCCL headers when present in a conda env.
-# This avoids mixing multiple CCCL header trees (e.g., CUDA toolkit vs RAPIDS).
-if(DEFINED ENV{CONDA_PREFIX})
-  set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-  if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-    message(STATUS "cuOpt: using RAPIDS CCCL headers from ${_CUOPT_CONDA_PREFIX}/include/rapids")
-    target_include_directories(cuopt BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-  endif()
-  unset(_CUOPT_CONDA_PREFIX)
-endif()
-
 add_library(cuopt::cuopt ALIAS cuopt)
 # ##################################################################################################
 # - include paths ---------------------------------------------------------------------------------
@@ -647,15 +636,6 @@ target_include_directories(cuopt_cli
   "$<INSTALL_INTERFACE:include>"
 )
 
-# Prefer RAPIDS CCCL headers for cuopt_cli when available in conda.
-if(DEFINED ENV{CONDA_PREFIX})
-  set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-  if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-    target_include_directories(cuopt_cli BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-  endif()
-  unset(_CUOPT_CONDA_PREFIX)
-endif()
-
 target_link_libraries(cuopt_cli
   PUBLIC
   cuopt

cpp/tests/linear_programming/CMakeLists.txt

@@ -28,20 +28,6 @@ if (NOT SKIP_C_PYTHON_ADAPTERS)
         PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests"
     )
-    if(DEFINED ENV{CONDA_PREFIX})
-        set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-        if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-            target_include_directories(c_api_tester BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-        endif()
-        unset(_CUOPT_CONDA_PREFIX)
-    endif()
-    if(DEFINED ENV{CONDA_PREFIX})
-        set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-        if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-            target_include_directories(c_api_tester BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-        endif()
-        unset(_CUOPT_CONDA_PREFIX)
-    endif()
 
     add_executable(C_API_TEST "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests/c_api_tests.cpp")
 
@@ -52,20 +38,6 @@ if (NOT SKIP_C_PYTHON_ADAPTERS)
         "${CUOPT_TEST_DIR}"
         "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests"
     )
-    if(DEFINED ENV{CONDA_PREFIX})
-        set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-        if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-            target_include_directories(C_API_TEST BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-        endif()
-        unset(_CUOPT_CONDA_PREFIX)
-    endif()
-    if(DEFINED ENV{CONDA_PREFIX})
-        set(_CUOPT_CONDA_PREFIX "$ENV{CONDA_PREFIX}")
-        if(EXISTS "${_CUOPT_CONDA_PREFIX}/include/rapids/cuda/std/__cccl/version.h")
-            target_include_directories(C_API_TEST BEFORE PRIVATE "${_CUOPT_CONDA_PREFIX}/include/rapids")
-        endif()
-        unset(_CUOPT_CONDA_PREFIX)
-    endif()
 
     target_link_libraries(C_API_TEST
         PRIVATE

python/cuopt/CMakeLists.txt

@@ -18,11 +18,6 @@ project(
             # that is fixed we need to keep C.
             C CXX CUDA)
 
-find_package(Protobuf REQUIRED)
-if(TARGET Protobuf::libprotobuf AND NOT TARGET protobuf::libprotobuf)
-  add_library(protobuf::libprotobuf ALIAS Protobuf::libprotobuf)
-endif()
-
 find_package(cuopt "${RAPIDS_VERSION}")
 find_package(mps_parser "${RAPIDS_VERSION}")
 

python/libcuopt/CMakeLists.txt

@@ -23,11 +23,6 @@ message(STATUS "=============================================================")
 
 # Check if cuopt is already available. If so, it is the user's responsibility to ensure that the
 # CMake package is also available at build time of the Python cuopt package.
-find_package(Protobuf REQUIRED)
-if(TARGET Protobuf::libprotobuf AND NOT TARGET protobuf::libprotobuf)
-  add_library(protobuf::libprotobuf ALIAS Protobuf::libprotobuf)
-endif()
-
 find_package(cuopt "${RAPIDS_VERSION}")
 
 if(cuopt_FOUND)