From 49e064cda7cfc2345074619cec190418b8e28d5e Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 12 Sep 2017 22:56:11 +0200
Subject: [PATCH] Restore INSTALL_NAME_DIR property for MacOS
---
coreblas/compute/CMakeLists.txt | 4 ++--
cudablas/compute/CMakeLists.txt | 1 +
runtime/starpu/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/coreblas/compute/CMakeLists.txt b/coreblas/compute/CMakeLists.txt
index c863f49da..f5f9ccc3b 100644
--- a/coreblas/compute/CMakeLists.txt
+++ b/coreblas/compute/CMakeLists.txt
@@ -109,8 +109,8 @@ set(COREBLAS_SRCS
add_library(coreblas ${COREBLAS_SRCS})
list(INSERT CHAMELEON_DEP 0 -lcoreblas)
add_dependencies(coreblas coreblas_include)
-#set_property(TARGET coreblas PROPERTY LINKER_LANGUAGE Fortran)
-#set_property(TARGET coreblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+set_property(TARGET coreblas PROPERTY LINKER_LANGUAGE Fortran)
+set_property(TARGET coreblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
target_link_libraries(coreblas
${LAPACKE_LIBRARIES}
diff --git a/cudablas/compute/CMakeLists.txt b/cudablas/compute/CMakeLists.txt
index ac5f965b2..b5c69b134 100644
--- a/cudablas/compute/CMakeLists.txt
+++ b/cudablas/compute/CMakeLists.txt
@@ -93,6 +93,7 @@ endif (CHAMELEON_USE_CUBLAS_V2)
add_library(cudablas ${CUDABLAS_SRCS})
add_dependencies(cudablas cudablas_include)
set_property(TARGET cudablas PROPERTY LINKER_LANGUAGE Fortran)
+set_property(TARGET cudablas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
target_link_libraries(cudablas
coreblas
diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index dfd436b54..ba66f9a32 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -125,8 +125,8 @@ set(RUNTIME_SRCS
# Add library
# -----------
add_library(chameleon_starpu ${RUNTIME_SRCS})
-#set_property(TARGET chameleon_starpu PROPERTY LINKER_LANGUAGE Fortran)
-#set_property(TARGET chameleon_starpu PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+set_property(TARGET chameleon_starpu PROPERTY LINKER_LANGUAGE Fortran)
+set_property(TARGET chameleon_starpu PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
target_link_libraries(chameleon_starpu
${STARPU_LIBRARIES_DEP})
--
GitLab