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
PhoenixBinaryAnalyzer
Commits
3bb56350
Commit
3bb56350
authored
Feb 17, 2021
by
Pierre Aubert
Browse files
Ready for version 1.5.4 (update find_package in pull extra modules as quiet)
parent
660d03d4
Pipeline
#105722
passed with stages
in 5 minutes and 14 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/pull_extra_module.cmake
cmake/pull_extra_module.cmake
+3
-3
No files found.
CMakeLists.txt
View file @
3bb56350
...
...
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
add_subdirectory
(
cmake
)
phoenix_base_project
(
"PhoenixBinaryAnalyzer"
"1.5.
3
"
phoenix_base_project
(
"PhoenixBinaryAnalyzer"
"1.5.
4
"
"Set of library to find attribute offset in given abstract binary file"
"https://gitlab.in2p3.fr/CTA-LAPP/PHOENIX_LIBS/PhoenixBinaryAnalyzer"
)
...
...
cmake/pull_extra_module.cmake
View file @
3bb56350
...
...
@@ -76,7 +76,7 @@ function(pull_extra_module packageName urlGitToPackage)
get_extra_module
(
${
packageName
}
${
urlGitToPackage
}
)
else
()
# Try to find the package
find_package
(
${
packageName
}
)
find_package
(
${
packageName
}
QUIET
)
string
(
TOUPPER
${
packageName
}
UPPER_PACKAGE_NAME
)
if
(
${${
UPPER_PACKAGE_NAME
}
_FOUND
}
)
# The package is found, we check if the module exist
...
...
@@ -99,7 +99,7 @@ endfunction(pull_extra_module)
# 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
function
(
phoenix_find_package packageName urlGitToPackage
)
find_package
(
${
packageName
}
)
find_package
(
${
packageName
}
QUIET
)
string
(
TOUPPER
${
packageName
}
UPPER_PACKAGE_NAME
)
message
(
STATUS
"FIND variable
${
packageName
}
_FOUND =
${${
UPPER_PACKAGE_NAME
}
_FOUND
}
"
)
if
(
NOT
${${
UPPER_PACKAGE_NAME
}
_FOUND
}
)
...
...
@@ -112,7 +112,7 @@ function(phoenix_find_package packageName urlGitToPackage)
WORKING_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
message
(
STATUS
"End of
${
basePackageDirName
}
installation"
)
find_package
(
${
packageName
}
)
find_package
(
${
packageName
}
QUIET
)
else
(
urlGitToPackage
)
message
(
FATAL_ERROR
"Package
${
packageName
}
not found and no url to fetch it"
)
endif
(
urlGitToPackage
)
...
...
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