Skip to content

Commit 4a764c1

Browse files
authored
add more build options; obviates fastjet-feedstock patch for passthru submodule (#351)
1 parent 02cd3a6 commit 4a764c1

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

CMakeLists.txt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ list(GET VERSION_SPLIT 1 SPLIT_VERSION_MINOR)
99

1010
project(fastjet VERSION ${SPLIT_VERSION_MAJOR}.${SPLIT_VERSION_MINOR} LANGUAGES CXX)
1111

12-
option(SKHEPFJ_USE_INSTALLED_FASTJET "Use an existing installed version of fastjet" OFF)
13-
option(SKHEPFJ_USE_INSTALLED_FASTJET_CONTRIB "Use an existing installed version of fastjet-contrib" OFF)
14-
option(SKHEPFJ_PATCH_FJCORE "Patch fastjet-contrib with CMAKE_INSTALL_LIBDIR use" ON)
15-
option(SKHEPFJ_PATCH_FJCONTRIB "Patch fastjet-contrib with cmake build" ON)
12+
option(SKHEPFJ_USE_INSTALLED_FASTJET "Use an existing installed version of fastjet" OFF)
13+
option(SKHEPFJ_USE_INSTALLED_FASTJET_CONTRIB "Use an existing installed version of fastjet-contrib" OFF)
14+
option(SKHEPFJ_PATCH_FJCORE "Patch fastjet-contrib with CMAKE_INSTALL_LIBDIR use" ON)
15+
option(SKHEPFJ_PATCH_FJCONTRIB "Patch fastjet-contrib with cmake build" ON)
16+
option(SKHEPFJ_PASSTHRU_FASTJET_SWIG "Create a _swig.py that just imports <fastjet-lib python module>" OFF)
17+
option(SKHEPFJ_COPY_GMP_DLL "On Windows, force a copy of the amp runtime .dll to the wheel area" OFF)
18+
19+
set(SKHEPFJ_FASTJET_LIB_PYMODULE_NAME "fastjet_cxx" CACHE STRING "The name of the installed fastjet python package.")
1620

1721
set(PKG_INSTALL "fastjet") ## python package name
1822

@@ -44,6 +48,10 @@ else()
4448
add_subdirectory(${CMAKE_SOURCE_DIR}/extern/fastjet-contrib)
4549
endif()
4650

51+
if (SKHEPFJ_PASSTHRU_FASTJET_SWIG)
52+
file(WRITE ${CMAKE_INSTALL_PREFIX}/_swig.py "from ${SKHEPFJ_FASTJET_LIB_PYMODULE_NAME} import *\n")
53+
endif()
54+
4755
pybind11_add_module(_ext MODULE src/_ext.cpp)
4856
target_link_libraries(_ext
4957
PRIVATE
@@ -57,12 +65,12 @@ target_include_directories(_ext PRIVATE ${CMAKE_BINARY_DIR}/include)
5765
#set_target_properties(_ext PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
5866
#set_target_properties(_ext PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
5967
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
60-
set_target_properties(_ext PROPERTIES INSTALL_RPATH "@loader_path/${CMAKE_INSTALL_LIBDIR}")
68+
set_target_properties(_ext PROPERTIES INSTALL_RPATH "@loader_path/${CMAKE_INSTALL_LIBDIR};@loader_path/../../../../${CMAKE_INSTALL_LIBDIR}")
6169
elseif(NOT MSVC)
62-
set_target_properties(_ext PROPERTIES INSTALL_RPATH "$ORIGIN/${CMAKE_INSTALL_LIBDIR}")
70+
set_target_properties(_ext PROPERTIES INSTALL_RPATH "$ORIGIN/${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../../../../${CMAKE_INSTALL_LIBDIR}")
6371
endif()
6472

65-
if (MSVC AND FASTJET_ENABLE_CGAL)
73+
if (SKHEPFJ_COPY_GMP_DLL AND MSVC AND FASTJET_ENABLE_CGAL)
6674
message("-- Copying ${GMP_DLL_TO_COPY} to project area!")
6775
install(FILES ${GMP_DLL_TO_COPY} DESTINATION ${CMAKE_INSTALL_PREFIX})
6876
endif()

0 commit comments

Comments
 (0)