Merge branch 'main' into feature/cuda_clusterfinder

python/CMakeLists.txt

@@ -1,18 +1,20 @@
 # SPDX-License-Identifier: MPL-2.0
 
-find_package (Python 3.10 COMPONENTS Interpreter Development.Module REQUIRED)
+find_package(
+  Python 3.10
+  COMPONENTS Interpreter Development.Module
+  REQUIRED)
 set(PYBIND11_FINDPYTHON ON) # Needed for RH8
 
 # Download or find pybind11 depending on configuration
 if(AARE_FETCH_PYBIND11)
-    FetchContent_Declare(
-        pybind11
-        GIT_REPOSITORY https://github.com/pybind/pybind11
-        GIT_TAG        v2.13.6
-    )
-    FetchContent_MakeAvailable(pybind11)
+  FetchContent_Declare(
+    pybind11
+    GIT_REPOSITORY https://github.com/pybind/pybind11
+    GIT_TAG v3.0.3)
+  FetchContent_MakeAvailable(pybind11)
 else()
-    find_package(pybind11 2.13 REQUIRED)
+  find_package(pybind11 3.0.3 REQUIRED)
 endif()
 
 # ---- Main CPU module --------------------------------------------------------
@@ -25,10 +27,9 @@ endif()
 pybind11_add_module(_aare NO_EXTRAS src/module.cpp)
  
 target_link_libraries(_aare PRIVATE aare_core aare_compiler_flags)
- 
-target_include_directories(_aare SYSTEM PRIVATE
-    $<TARGET_PROPERTY:Minuit2::Minuit2,INTERFACE_INCLUDE_DIRECTORIES>
-)
+target_include_directories(
+  _aare SYSTEM
+  PRIVATE $<TARGET_PROPERTY:Minuit2::Minuit2,INTERFACE_INCLUDE_DIRECTORIES>)
  
 set_target_properties(_aare PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/aare
@@ -61,7 +62,7 @@ if(AARE_CUDA)
 endif()
 
 # List of python files to be copied to the build directory
-set( PYTHON_FILES
+set(PYTHON_FILES
     aare/__init__.py
     aare/CtbRawFile.py
     aare/ClusterFinder.py
@@ -72,32 +73,25 @@ set( PYTHON_FILES
     aare/RawFile.py
     aare/transform.py
     aare/ScanParameters.py
-    aare/utils.py
-)
-
+    aare/utils.py)
 
 # Copy the python files to the build directory
 foreach(FILE ${PYTHON_FILES})
-    configure_file(${FILE} ${CMAKE_BINARY_DIR}/${FILE}  )
+    configure_file(${FILE} ${CMAKE_BINARY_DIR}/${FILE})
 endforeach(FILE ${PYTHON_FILES})
 
 # set_target_properties(_aare PROPERTIES
 #     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/aare
 # )
 
-set(PYTHON_EXAMPLES
-    examples/play.py
-    examples/fits.py
-)
-
+set(PYTHON_EXAMPLES examples/play.py examples/fits.py)
 
 # Copy the python examples to the build directory
 foreach(FILE ${PYTHON_EXAMPLES})
-    configure_file(${FILE} ${CMAKE_BINARY_DIR}/${FILE}  )
-    message(STATUS "Copying ${FILE} to ${CMAKE_BINARY_DIR}/${FILE}")
+  configure_file(${FILE} ${CMAKE_BINARY_DIR}/${FILE})
+  message(STATUS "Copying ${FILE} to ${CMAKE_BINARY_DIR}/${FILE}")
 endforeach(FILE ${PYTHON_EXAMPLES})
 
-
 if(AARE_INSTALL_PYTHONEXT)
     set(AARE_PY_INSTALL_TARGETS _aare)
     if(AARE_CUDA)
@@ -116,4 +110,4 @@ if(AARE_INSTALL_PYTHONEXT)
         DESTINATION aare
         COMPONENT python
     )
-endif()
+endif()