Commit bffed4f9 authored by Pierre Aubert's avatar Pierre Aubert
Browse files

Ready for version 1.5.4 (update find_package in pull extra modules as quiet)

parent 06197bab
Pipeline #105723 passed with stages
in 16 minutes and 41 seconds
...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) ...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
add_subdirectory(cmake) add_subdirectory(cmake)
phoenix_base_project("PhoenixHPCProxy" "1.5.3" phoenix_base_project("PhoenixHPCProxy" "1.5.4"
"Program which generates proxy library to handle automatically all kind of architectures and CPU extentions (AVX, AVX2, AVX512F, SSE4, etc)" "Program which generates proxy library to handle automatically all kind of architectures and CPU extentions (AVX, AVX2, AVX512F, SSE4, etc)"
"https://gitlab.in2p3.fr/CTA-LAPP/PHOENIX_LIBS/PhoenixHPCProxy") "https://gitlab.in2p3.fr/CTA-LAPP/PHOENIX_LIBS/PhoenixHPCProxy")
......
...@@ -76,7 +76,7 @@ function(pull_extra_module packageName urlGitToPackage) ...@@ -76,7 +76,7 @@ function(pull_extra_module packageName urlGitToPackage)
get_extra_module(${packageName} ${urlGitToPackage}) get_extra_module(${packageName} ${urlGitToPackage})
else() else()
# Try to find the package # Try to find the package
find_package(${packageName}) find_package(${packageName} QUIET)
string(TOUPPER ${packageName} UPPER_PACKAGE_NAME) string(TOUPPER ${packageName} UPPER_PACKAGE_NAME)
if(${${UPPER_PACKAGE_NAME}_FOUND}) if(${${UPPER_PACKAGE_NAME}_FOUND})
# The package is found, we check if the module exist # The package is found, we check if the module exist
...@@ -99,7 +99,7 @@ endfunction(pull_extra_module) ...@@ -99,7 +99,7 @@ endfunction(pull_extra_module)
# packageName : name of the package to be found (classic parameter of find_package) # packageName : name of the package to be found (classic parameter of find_package)
# urlGitToPackage : url of the git repository to be used to fetch it if it is not found # urlGitToPackage : url of the git repository to be used to fetch it if it is not found
function(phoenix_find_package packageName urlGitToPackage) function(phoenix_find_package packageName urlGitToPackage)
find_package(${packageName}) find_package(${packageName} QUIET)
string(TOUPPER ${packageName} UPPER_PACKAGE_NAME) string(TOUPPER ${packageName} UPPER_PACKAGE_NAME)
message(STATUS "FIND variable ${packageName}_FOUND = ${${UPPER_PACKAGE_NAME}_FOUND}") message(STATUS "FIND variable ${packageName}_FOUND = ${${UPPER_PACKAGE_NAME}_FOUND}")
if(NOT ${${UPPER_PACKAGE_NAME}_FOUND}) if(NOT ${${UPPER_PACKAGE_NAME}_FOUND})
...@@ -112,7 +112,7 @@ function(phoenix_find_package packageName urlGitToPackage) ...@@ -112,7 +112,7 @@ function(phoenix_find_package packageName urlGitToPackage)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
message(STATUS "End of ${basePackageDirName} installation") message(STATUS "End of ${basePackageDirName} installation")
find_package(${packageName}) find_package(${packageName} QUIET)
else(urlGitToPackage) else(urlGitToPackage)
message(FATAL_ERROR "Package ${packageName} not found and no url to fetch it") message(FATAL_ERROR "Package ${packageName} not found and no url to fetch it")
endif(urlGitToPackage) endif(urlGitToPackage)
......
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