Skip to content

Commit

Permalink
Merge branch 'eschnett/julia-bindings' of ssh://github.com/eschnett/o…
Browse files Browse the repository at this point in the history
…penPMD-api into eschnett/julia-bindings
  • Loading branch information
eschnett committed Aug 18, 2023
2 parents c6fe874 + d427b19 commit 184610f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
-DopenPMD_USE_PYTHON=ON \
-DopenPMD_USE_INVASIVE_TESTS=ON
cmake --build build --parallel 3
ctest --test-dir build --verbose
# Install the Julia side of CxxWrap
julia --eval 'using Pkg; Pkg.add("CxxWrap")'
julia src/binding/julia/tests/minimal_example.jl
ctest --test-dir build --verbose
appleclang13_py:
runs-on: macos-11
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ endif()
if(openPMD_HAVE_JULIA)
get_target_property(JlCxx_location JlCxx::cxxwrap_julia LOCATION)
get_filename_component(JlCxx_location ${JlCxx_location} DIRECTORY)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${JlCxx_location}")
message(STATUS "Found JlCxx version ${JlCxx_VERSION} at ${JlCxx_location}")
endif()

Expand Down Expand Up @@ -1133,6 +1132,9 @@ if(openPMD_INSTALL)
if(openPMD_HAVE_PYTHON)
list(APPEND openPMD_INSTALL_RPATH_TARGET_NAMES openPMD.py)
endif()
if(openPMD_HAVE_JULIA)
list(APPEND openPMD_INSTALL_RPATH_TARGET_NAMES openPMD.jl)
endif()
if(NOT DEFINED CMAKE_INSTALL_RPATH)
if(APPLE)
set_target_properties(${openPMD_INSTALL_RPATH_TARGET_NAMES} PROPERTIES
Expand Down

0 comments on commit 184610f

Please sign in to comment.