From b020f033f92740ffd88d7e10ae2f93e87f375216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franck=20P=C3=A9rignon?= <franck.perignon@imag.fr>
Date: Mon, 27 Oct 2014 14:35:53 +0100
Subject: [PATCH] Fix build env pb
---
HySoP/src/CMakeLists.txt | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/HySoP/src/CMakeLists.txt b/HySoP/src/CMakeLists.txt
index 5905834e0..560d0c992 100644
--- a/HySoP/src/CMakeLists.txt
+++ b/HySoP/src/CMakeLists.txt
@@ -97,8 +97,6 @@ if(WITH_FFTW)
endforeach()
set(FFTWLIB ${dirlist} CACHE PATH "fftw libraries dir")
endif()
-display(FFTWLIB)
-
# ============= Generates ParmesConfig.hpp =============
# The file PARMES_LIBRARY_NAME_defines.hpp will be generated from config.hpp.cmake;
@@ -198,23 +196,23 @@ else()
endif()
-# do not skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-# the RPATH to be used when installing
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-#set(CMAKE_INSTALL_RPATH "")
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+# # do not skip the full RPATH for the build tree
+# set(CMAKE_SKIP_BUILD_RPATH FALSE)
+# # when building, don't use the install RPATH already
+# # (but later on when installing)
+# set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+# # the RPATH to be used when installing
+# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+# #set(CMAKE_INSTALL_RPATH "")
+# # add the automatically determined parts of the RPATH
+# # which point to directories outside the build tree to the install RPATH
+# SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# the RPATH to be used when installing, but only if it's not a system directory
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-ENDIF("${isSystemDir}" STREQUAL "-1")
+# LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+# IF("${isSystemDir}" STREQUAL "-1")
+# SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+# ENDIF("${isSystemDir}" STREQUAL "-1")
# ============== Add tests ==============
if(WITH_TESTS)
--
GitLab