Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CTA-LAPP
PHOENIX_LIBS
PhoenixMath
Commits
bcc9d384
Commit
bcc9d384
authored
Feb 26, 2021
by
Pierre Aubert
Browse files
Automatically deal with anaconda environnement on the install. Remove useless print of library dir
parent
c29c74ce
Pipeline
#109605
passed with stages
in 7 minutes and 44 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
7 deletions
+23
-7
cmake/CMakeLists.txt
cmake/CMakeLists.txt
+1
-0
cmake/environnement_prefix.cmake
cmake/environnement_prefix.cmake
+21
-0
cmake/phoenix_base_project.cmake
cmake/phoenix_base_project.cmake
+0
-6
cmake/rpath_utils.cmake
cmake/rpath_utils.cmake
+1
-1
No files found.
cmake/CMakeLists.txt
View file @
bcc9d384
...
...
@@ -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
()
...
...
cmake/environnement_prefix.cmake
0 → 100644
View file @
bcc9d384
# 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
)
cmake/phoenix_base_project.cmake
View file @
bcc9d384
...
...
@@ -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"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Coverage"
)
...
...
cmake/rpath_utils.cmake
View file @
bcc9d384
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment