CMake: Modernize DEAL_II_PACKAGE_HANDLE macro and clean up Find*.cmake files #13325
Conversation
|
I have manually verified that this still produces the same |
| @@ -33,14 +33,14 @@ | |||
| MESSAGE(STATUS "This is CMake ${CMAKE_VERSION}") | |||
| MESSAGE(STATUS "") | |||
|
|
|||
| CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0) | |||
| CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0) | |||
There was a problem hiding this comment.
we currently require 3.1 according to https://www.dealii.org/developer/readme.html
Do you need 3.3? If yes then we need to adjust.
There was a problem hiding this comment.
Yes. I chose to simply bump to 3.3.0. It will make some cleanup of the CMake code I plan to do easier - and version 3.3.0 is reasonably ancient (Ubuntu 16.04 LTS already shipped 3.5.0). I have adjusted the readme and the rest of the documentation to state 3.3.0.
| AND "${_suffix}" STREQUAL "LIBRARIES") | ||
| LIST(APPEND _temp_${_suffix} ${_arg}) | ||
|
|
||
| ELSEIF("${_arg}" STREQUAL "CLEAR") # FIXME |
There was a problem hiding this comment.
I forgot to finish refactoring. The variable _fill_clear is now gone and the FIXMEs have been removed.
* simplify logic by removing unnecessary booleans * use temporary variables to accumulate lists/string and override canonical names at end
- address FIXMEs - address reviews
|
@tjhei Thanks for the thorough read! I hope I have addressed all review comments. I checked that my latest changes still produce the same |
|
@tjhei Done! |
This pull request changes the
DEAL_II_PACKAGE_HANDLEmacro:This allows to use "canonical" names such as "FEATURE_LIBRARIES" already in
the call to
DEAL_II_PACKAGE_HANDLEby clearing these variables at the endand not at the beginning of the
DEAL_II_PACKAGE_HANDLEmacro.This also raises the required minimal CMake version to 3.3.0 which was released 7 years ago.