Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 4477f1ab 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 86a38904
Pipeline #109607 passed with stages
in 22 minutes and 50 seconds
......@@ -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()
# 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)
......@@ -24,13 +24,7 @@ function(phoenix_base_project programName programVersion programDescritpion prog
set(VALGRIND_TEST yes CACHE BOOL "enable test with valgrind")
message(STATUS "VALGRIND_TEST = ${VALGRIND_TEST}")
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}")
......
......@@ -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)
......
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