Revert "turn off CGAL while we understand what is wrong with fastjet-contrib"

This reverts commit b9764c3.

Author: lgray

.github/workflows/ci.yml

@@ -49,8 +49,8 @@ jobs:
       - name: Install compiler tools on windows
         if: runner.os == 'windows'
         run: |
-          #choco install boost-msvc-14.1
-          vcpkg.exe install getopt #cgal
+          choco install boost-msvc-14.1
+          vcpkg.exe install cgal getopt
 
       - name: Install compiler tools on macOS
         if: runner.os == 'macOS'
@@ -79,11 +79,11 @@ jobs:
         if: runner.os == 'windows'
         run: |
           $Env:Path
-          #$Env:CGAL_DIR = 'C:\vcpkg\packages\cgal_x64-windows\share\cgal'
-          #$Env:GMP_INC_DIR = 'C:\vcpkg\packages\gmp_x64-windows\include'
-          #$Env:GMP_LIB_DIR = 'C:\vcpkg\packages\gmp_x64-windows\lib'
-          #$Env:MPFR_INC_DIR = 'C:\vcpkg\packages\mpfr_x64-windows\include'
-          #$Env:MPFR_LIB_DIR = 'C:\vcpkg\packages\mpfr_x64-windows\lib'
+          $Env:CGAL_DIR = 'C:\vcpkg\packages\cgal_x64-windows\share\cgal'
+          $Env:GMP_INC_DIR = 'C:\vcpkg\packages\gmp_x64-windows\include'
+          $Env:GMP_LIB_DIR = 'C:\vcpkg\packages\gmp_x64-windows\lib'
+          $Env:MPFR_INC_DIR = 'C:\vcpkg\packages\mpfr_x64-windows\include'
+          $Env:MPFR_LIB_DIR = 'C:\vcpkg\packages\mpfr_x64-windows\lib'
           #$Env:Boost_DIR = 'C:\vcpkg\packages\boost-cmake_x64-windows\share\boost'
           #$Env:boost_headers_DIR = 'C:\vcpkg\packages\boost-headers_x64-windows\share\boost_headers'
           #$Env:boost_config_DIR = 'C:\vcpkg\packages\boost-config_x64-windows\share\boost_config'

CMakeLists.txt

@@ -15,14 +15,14 @@ include(FetchContent)
 
 find_package(pybind11 REQUIRED)
 
-#find_package(CGAL)
-#if (NOT CGAL_FOUND)
-#  FetchContent_Declare(CGAL
-#    GIT_REPOSITORY https://github.com/CGAL/cgal.git
-#    GIT_TAG  v6.0.1
-#  )
-#  FetchContent_MakeAvailable(CGAL)
-#endif()
+find_package(CGAL)
+if (NOT CGAL_FOUND)
+  FetchContent_Declare(CGAL
+    GIT_REPOSITORY https://github.com/CGAL/cgal.git
+    GIT_TAG  v6.0.1
+  )
+  FetchContent_MakeAvailable(CGAL)
+endif()
 
 #FetchContent_Declare(fastjet
 #    SOURCE_DIR ${CMAKE_SOURCE_DIR}/extern/fastjet-core

pyproject.toml

@@ -123,7 +123,7 @@ wheel.install-dir = "fastjet"
 
 [tool.scikit-build.cmake.define]
 FASTJET_ENABLE_PYTHON = "ON"
-FASTJET_ENABLE_CGAL = "OFF"
+FASTJET_ENABLE_CGAL = "ON"
 FASTJET_PYTHON_PACKAGE_NAME = "_swig"
 FASTJET_CUSTOM_PYTHON_INSTALL = "./"
 FASTJET_ENABLE_PLUGIN_PXCONE = "OFF"