Commit f9dd5d66 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by jlaura
Browse files

fix macOS rpath error (#15) 

* fix OSX rpath error

* removed python include dir print line
parent c35028fa

python/CMakeLists.txt

+9 −8
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ find_library(CSM_LIBRARY NAMES csmapi 
            PATHS ${PYTHON_LIBRARY}/../)

message("-- Found CSM Include: ${CSM_INCLUDE_DIR}")

message("-- Found CSM Lib: ${CSM_LIBRARY}")



include_directories(${CSM_INCLUDE_DIR})



# Add and link
@@ -25,6 +24,8 @@ swig_add_library(csmapi 


set_target_properties(_csmapi PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SWIG_OUTDIR})



SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")



if (APPLE)

     set_target_properties(_csmapi PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

     # On OSX, do not link python - this causes segfaults

recipe/build.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/bash



mkdir build && cd build

mkdir -p build && cd build

cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DANACONDA_PYTHON_VERBOSE=ON ..

make

cd python

recipe/meta.yaml

+4 −3
Original line number Diff line number Diff line
@@ -9,12 +9,13 @@ requirements: 
  build:

    - {{ compiler('cxx') }}  # [linux]

    - cmake >=3.10

    - python

  host:

    - libcsm

    - csm

    - python

    - swig

  run:

    - libcsm

    - csm

    - python

    - numpy