Make INSTALL_RPATH_USE_LINK_PATH global for cibuildwheel.

glotzerlab · Jun 24, 2024 · 2044415 · 2044415
1 parent 2c0c79e
commit 2044415
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -96,8 +96,8 @@ jobs:
           CIBW_ARCHS: auto64
 
           # Configure environment variables.
-          CIBW_ENVIRONMENT_LINUX: "CMAKE_PREFIX_PATH=/project/tbb LD_LIBRARY_PATH=/project/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH"
-          CIBW_ENVIRONMENT_MACOS: "CMAKE_PREFIX_PATH=/Users/runner/work/freud/freud/tbb:/Users/runner/work/tbb-install LD_LIBRARY_PATH=/Users/runner/work/freud/freud/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH"
+          CIBW_ENVIRONMENT_LINUX: "CMAKE_PREFIX_PATH=/project/tbb LD_LIBRARY_PATH=/project/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH CMAKE_ARGS=-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=True"
+          CIBW_ENVIRONMENT_MACOS: "CMAKE_PREFIX_PATH=/Users/runner/work/freud/freud/tbb:/Users/runner/work/tbb-install LD_LIBRARY_PATH=/Users/runner/work/freud/freud/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH CMAKE_ARGS=-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=True"
           MACOSX_DEPLOYMENT_TARGET: "10.14"
 
           # Set up TBB.

diff --git a/cpp/box/CMakeLists.txt b/cpp/box/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
   set_target_properties(_box PROPERTIES INSTALL_RPATH "\$ORIGIN")
 endif()
 
-if(_using_conda OR DEFINED ENV{CIBUILDWHEEL})
+if(_using_conda)
   set_target_properties(_box PROPERTIES INSTALL_RPATH_USE_LINK_PATH True)
 endif()
 

diff --git a/cpp/parallel/CMakeLists.txt b/cpp/parallel/CMakeLists.txt
@@ -7,7 +7,7 @@ else()
   set_target_properties(_parallel PROPERTIES INSTALL_RPATH "\$ORIGIN")
 endif()
 
-if(_using_conda OR DEFINED ENV{CIBUILDWHEEL})
+if(_using_conda)
   set_target_properties(_parallel PROPERTIES INSTALL_RPATH_USE_LINK_PATH True)
 endif()