Review Request 117619: Make ecm_setup_version interact well with CMP0048

David Faure faure at kde.org
Mon Apr 21 21:42:47 UTC 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/117619/#review56144
-----------------------------------------------------------


Thank you so much. This was supposed to be on my todo list, but I had forgotten about it. And you did it much better than I would ever have done, with cmake-based unittests and all :-)

+1 from me, giving a chance to Alex Neundorf to review it in more details.


modules/ECMSetupVersion.cmake
<https://git.reviewboard.kde.org/r/117619/#comment39170>

    The sentence is ambiguous. It could mean "_VERSION_STRING is for compat, use _VERSION instead", or it could mean "_VERSION_STRING is newer, but if you want your code to be more compatible, use _VERSION".
    
    From the diff I assume the first one was meant, so append "instead" and turn the ',' into ';', maybe?
    
    


- David Faure


On April 17, 2014, 9:13 p.m., Alex Merry wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/117619/
> -----------------------------------------------------------
> 
> (Updated April 17, 2014, 9:13 p.m.)
> 
> 
> Review request for Build System, Extra Cmake Modules and KDE Frameworks.
> 
> 
> Repository: extra-cmake-modules
> 
> 
> Description
> -------
> 
> Make ecm_setup_version interact well with CMP0048
> 
> When CMake policy CMP0048 (CMake 3.0) is set to NEW, the project()
> command is meant to manage the project's version variables. We therefore
> do not set the PROJECT_VERSION variables in this case.
> 
> To make sure projects do not have to specify their version in multiple
> places, this also allows the keyword "PROJECT" to be passed to
> ecm_setup_version instead of an actual version number. In this case, the
> version passed to project() will be used.
> 
> 
> Diffs
> -----
> 
>   modules/ECMSetupVersion.cmake 3ae6fa8f73357f5958de9f54adf083bf6de03df0 
>   modules/ECMVersionHeader.h.in 19eb96c53d3b518df6b364e249707f12892b6893 
>   tests/CMakeLists.txt e464a0305bd71364463c3132103ffe02dcb94eb6 
>   tests/ECMSetupVersionTest/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_header/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_header/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_header_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_header_abspath/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_simple/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_simple/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_soversion/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_soversion/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_version_file/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_version_file/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_version_file_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_explicit_version_file_abspath/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header_abspath/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header_prefix/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_header_prefix/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_simple/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_simple/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_simple_prefix/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_simple_prefix/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_soversion/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_soversion/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_soversion_prefix/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_soversion_prefix/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_version_file/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_version_file/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_version_file_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/new_project_version_file_abspath/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_header/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_header/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_header_abspath/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_simple/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_simple/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_soversion/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_version_file/main.c PRE-CREATION 
>   tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt PRE-CREATION 
>   tests/ECMSetupVersionTest/old_version_file_abspath/main.c PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/117619/diff/
> 
> 
> Testing
> -------
> 
> Bundled autotests pass. Freshly configured, built and installed KArchive - version header file and KF5ArchiveConfigVersion.cmake correct by inspection. KEmoticons then configured successfully (finding KF5Archive >= 4.96.0).
> 
> 
> Thanks,
> 
> Alex Merry
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140421/20a6753c/attachment-0001.html>


More information about the Kde-frameworks-devel mailing list