From d73d7534de403c93faf29aded7cc78b1076e5abf Mon Sep 17 00:00:00 2001
From: Pierre Aubert <aubertp7@gmail.com>
Date: Fri, 26 Feb 2021 11:53:10 +0100
Subject: [PATCH] Automatically deal with anaconda environnement on the
install. Remove useless print of library dir
---
cmake/CMakeLists.txt | 1 +
cmake/environnement_prefix.cmake | 21 +++++++++++++++++++++
cmake/phoenix_base_project.cmake | 6 ------
cmake/rpath_utils.cmake | 2 +-
4 files changed, 23 insertions(+), 7 deletions(-)
create mode 100644 cmake/environnement_prefix.cmake
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 8a8237c..bf15cb0 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -8,6 +8,7 @@ if(NOT MODULE_MODE)
include(rpath_utils.cmake)
include(pull_extra_module.cmake)
include(create_doc.cmake)
+ include(environnement_prefix.cmake)
include(create_find_project.cmake)
endif()
diff --git a/cmake/environnement_prefix.cmake b/cmake/environnement_prefix.cmake
new file mode 100644
index 0000000..46e3849
--- /dev/null
+++ b/cmake/environnement_prefix.cmake
@@ -0,0 +1,21 @@
+
+# Setting the default phoenix install prefix
+set(PHOENIX_INSTALL_PREFIX "$ENV{HOME}/usr" CACHE STRING "Phoenix Install prefix" FORCE)
+
+if(DEFINED ENV{CONDA_PREFIX})
+ message(STATUS "Find conda variable CONDA_PREFIX = '$ENV{CONDA_PREFIX}' used as new install prefix")
+ set(PHOENIX_INSTALL_PREFIX "$ENV{CONDA_PREFIX}" CACHE STRING "Phoenix Install prefix" FORCE)
+endif()
+
+if(DEFINED ENV{CONDA_ENV_PATH})
+ message(STATUS "Find conda variable CONDA_ENV_PATH = '$ENV{CONDA_ENV_PATH}' used as new install prefix")
+ set(PHOENIX_INSTALL_PREFIX "$ENV{CONDA_ENV_PATH}" CACHE STRING "Phoenix Install prefix" FORCE)
+endif()
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX "${PHOENIX_INSTALL_PREFIX}" CACHE PATH "cmake install prefix" FORCE)
+endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake CACHE STRING "cmake module path" FORCE)
+
+
diff --git a/cmake/phoenix_base_project.cmake b/cmake/phoenix_base_project.cmake
index f67bcc6..7db6b7f 100644
--- a/cmake/phoenix_base_project.cmake
+++ b/cmake/phoenix_base_project.cmake
@@ -21,13 +21,7 @@ function(phoenix_base_project programName programVersion programDescritpion prog
set(SELF_TESTS_MODE yes CACHE BOOL "Self test mode")
message(STATUS "SELF_TESTS_MODE = ${SELF_TESTS_MODE}")
- set(PHOENIX_INSTALL_PREFIX "$ENV{HOME}/usr" CACHE STRING "Install prefix")
- if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(CMAKE_INSTALL_PREFIX "${PHOENIX_INSTALL_PREFIX}" CACHE PATH "cmake install prefix" FORCE)
- endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
- set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake CACHE STRING "cmake module path")
set(PHOENIX_FORCE_PULL_MODULE no CACHE BOOL "Say if the submodule have to be pulled every time or not")
add_definitions(--std=c++11 -Wall -Werror -g -O2 -D__PROGRAM_VERSION__="${PROGRAM_VERSION}")
diff --git a/cmake/rpath_utils.cmake b/cmake/rpath_utils.cmake
index 6476365..a2d44fd 100644
--- a/cmake/rpath_utils.cmake
+++ b/cmake/rpath_utils.cmake
@@ -20,7 +20,7 @@ if(CREATE_RPM)
set(LIBRARY_DIRECTORY "lib64")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/lib64")
endif()
-message(STATUS "LIBRARY_DIRECTORY = '${LIBRARY_DIRECTORY}'")
+
if(CREATE_RPM OR CREATE_DEB)
--
GitLab