Reorganize C++ and Python into a unified directory space.

glotzerlab · Aug 29, 2024 · 59b03e6 · 59b03e6
1 parent ae4c897
commit 59b03e6
Show file tree

Hide file tree

Showing 135 changed files with 246 additions and 259 deletions.
diff --git a/CMake/freud-macros.cmake b/CMake/freud-macros.cmake
@@ -14,11 +14,3 @@ macro(find_package_config_first package)
     endif()
   endif()
 endmacro()
-
-# set the rpath for installing python extension modules
-function(target_set_install_rpath _target)
-  if(_using_conda)
-    set_target_properties(${_target} PROPERTIES INSTALL_RPATH_USE_LINK_PATH
-                                                True)
-  endif()
-endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,13 +47,6 @@ if(nanobind_FOUND)
     "[${nanobind_DIR},${nanobind_VERSION}]")
 endif()
 
-# shared nanobind linking seems broken on windows for unknown reasons
-if(WIN32)
-  set(freud_nanobind_linking "NB_STATIC")
-else()
-  set(freud_nanobind_linking "NB_STATIC")
-endif()
-
 # Fail fast if users have not cloned submodules.
 if(NOT WIN32)
   string(ASCII 27 Esc)
@@ -81,9 +74,27 @@ if(WIN32)
   add_compile_options(/DNOMINMAX)
 endif()
 
+# Detect when building against a conda environment set the _using_conda variable
+# for use both in this file and in the parent
+get_filename_component(_python_bin_dir ${Python_EXECUTABLE} DIRECTORY)
+if(EXISTS "${_python_bin_dir}/../conda-meta")
+  message(STATUS "Detected conda environment, setting INSTALL_RPATH_USE_LINK_PATH")
+  set(_using_conda On)
+else()
+  set(_using_conda Off)
+endif()
+
 include_directories(
-  ${PROJECT_SOURCE_DIR}/cpp/util ${PROJECT_SOURCE_DIR}/cpp/locality
-  ${PROJECT_SOURCE_DIR}/cpp/box)
+  ${PROJECT_SOURCE_DIR}/freud/box
+  ${PROJECT_SOURCE_DIR}/freud/cluster
+  ${PROJECT_SOURCE_DIR}/freud/density
+  ${PROJECT_SOURCE_DIR}/freud/diffraction
+  ${PROJECT_SOURCE_DIR}/freud/environment
+  ${PROJECT_SOURCE_DIR}/freud/locality
+  ${PROJECT_SOURCE_DIR}/freud/order
+  ${PROJECT_SOURCE_DIR}/freud/parallel
+  ${PROJECT_SOURCE_DIR}/freud/pmft
+  ${PROJECT_SOURCE_DIR}/freud/util
+  )
 
-add_subdirectory(cpp)
 add_subdirectory(freud)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
diff --git a/cpp/box/CMakeLists.txt b/cpp/box/CMakeLists.txt
diff --git a/cpp/box/box-files.cmake b/cpp/box/box-files.cmake
diff --git a/cpp/cluster/CMakeLists.txt b/cpp/cluster/CMakeLists.txt
diff --git a/cpp/density/CMakeLists.txt b/cpp/density/CMakeLists.txt
diff --git a/cpp/diffraction/CMakeLists.txt b/cpp/diffraction/CMakeLists.txt
diff --git a/cpp/environment/CMakeLists.txt b/cpp/environment/CMakeLists.txt
diff --git a/cpp/locality/CMakeLists.txt b/cpp/locality/CMakeLists.txt
diff --git a/cpp/locality/locality-files.cmake b/cpp/locality/locality-files.cmake
diff --git a/cpp/order/CMakeLists.txt b/cpp/order/CMakeLists.txt
diff --git a/cpp/parallel/CMakeLists.txt b/cpp/parallel/CMakeLists.txt
diff --git a/cpp/parallel/parallel-files.cmake b/cpp/parallel/parallel-files.cmake
diff --git a/cpp/pmft/CMakeLists.txt b/cpp/pmft/CMakeLists.txt
diff --git a/cpp/pmft/pmft-files.cmake b/cpp/pmft/pmft-files.cmake
diff --git a/cpp/util/CMakeLists.txt b/cpp/util/CMakeLists.txt
diff --git a/cpp/util/util-files.cmake b/cpp/util/util-files.cmake