From 3f53588de7e20dfa8344c7b853e5f81dee1f40c0 Mon Sep 17 00:00:00 2001 From: Pix4d Date: Wed, 11 Oct 2017 07:02:53 +0200 Subject: [PATCH] (Travis) Should run tests on mac --- .travis/run.sh | 3 ++- CMakeLists.txt | 5 ++++- conanfile.py | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis/run.sh b/.travis/run.sh index d57a2944..b6bff021 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -9,5 +9,6 @@ conan install .. --build missing --profile release cmake ${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=install .. make -j2 make tests -bin/unit_tests make install +cd bin +./unit_tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d6a2bee..7e987417 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(CMAKE_MACOSX_RPATH 1) +set(CMAKE_MACOSX_RPATH ON) +if (APPLE) + set(CMAKE_INSTALL_RPATH "@executable_path/../lib") +endif() set( PACKAGE_COPYRIGHT "Andreas Huggel" ) set( PACKAGE_BUGREPORT "http://github.com/exiv2/exiv2" ) diff --git a/conanfile.py b/conanfile.py index c4c014d3..5a158eff 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,3 +24,4 @@ class Exiv2Conan(ConanFile): def imports(self): self.copy('*.dll', dst='bin', src='bin') + self.copy('*.dylib', dst='bin', src='lib')