Commit 1b64b723 authored by Pierre Aubert's avatar Pierre Aubert
Browse files

Automatically deal with anaconda environnement on the install. Remove useless print of library dir

parent ecbe6824
Pipeline #109611 passed with stages
in 16 minutes and 2 seconds
...@@ -8,6 +8,7 @@ if(NOT MODULE_MODE) ...@@ -8,6 +8,7 @@ if(NOT MODULE_MODE)
include(rpath_utils.cmake) include(rpath_utils.cmake)
include(pull_extra_module.cmake) include(pull_extra_module.cmake)
include(create_doc.cmake) include(create_doc.cmake)
include(environnement_prefix.cmake)
include(create_find_project.cmake) include(create_find_project.cmake)
endif() endif()
......
# 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)
...@@ -21,13 +21,7 @@ function(phoenix_base_project programName programVersion programDescritpion prog ...@@ -21,13 +21,7 @@ function(phoenix_base_project programName programVersion programDescritpion prog
set(SELF_TESTS_MODE yes CACHE BOOL "Self test mode") set(SELF_TESTS_MODE yes CACHE BOOL "Self test mode")
message(STATUS "SELF_TESTS_MODE = ${SELF_TESTS_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") set(PHOENIX_FORCE_PULL_MODULE no CACHE BOOL "Say if the submodule have to be pulled every time or not")
if(CMAKE_BUILD_TYPE STREQUAL "Coverage") if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
......
...@@ -20,7 +20,7 @@ if(CREATE_RPM) ...@@ -20,7 +20,7 @@ if(CREATE_RPM)
set(LIBRARY_DIRECTORY "lib64") set(LIBRARY_DIRECTORY "lib64")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/lib64") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/lib64")
endif() endif()
message(STATUS "LIBRARY_DIRECTORY = '${LIBRARY_DIRECTORY}'")
if(CREATE_RPM OR CREATE_DEB) if(CREATE_RPM OR CREATE_DEB)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment