diff options
| author | adridg <adridg@FreeBSD.org> | 2017-09-15 05:02:51 +0800 |
|---|---|---|
| committer | adridg <adridg@FreeBSD.org> | 2017-09-15 05:02:51 +0800 |
| commit | 09b73d7ce3bed9ff760b2d8c786bd0baa67d6e45 (patch) | |
| tree | 570aeb8e9fcad4efb19711621999d3df8296b6b9 /security/openconnect-gui | |
| parent | 738d9f9aaaf7e78224386120cc5ea2b44702376f (diff) | |
| download | freebsd-ports-gnome-09b73d7ce3bed9ff760b2d8c786bd0baa67d6e45.tar.gz freebsd-ports-gnome-09b73d7ce3bed9ff760b2d8c786bd0baa67d6e45.tar.zst freebsd-ports-gnome-09b73d7ce3bed9ff760b2d8c786bd0baa67d6e45.zip | |
Update CMake to 3.9, merge devel/cmake-modules into devel/cmake
Thanks to antoine@ for the exp-run.
Approved by: rakuco (mentor)
Reviewed by: tcberner (mentor)
Reviewed by: mat
PR: 222000 (exp-run)
Differential Revision: https://reviews.freebsd.org/D12299
Diffstat (limited to 'security/openconnect-gui')
| -rw-r--r-- | security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake b/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake new file mode 100644 index 000000000000..15ea1966dda1 --- /dev/null +++ b/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake @@ -0,0 +1,28 @@ +Has been submitted upstream. With ninja, the generated file +is not recognized as a dependency and not generated before it is +#included from other code. + +--- CMake/Includes/git_revision_main.cmake.orig 2016-08-28 20:11:26 UTC ++++ CMake/Includes/git_revision_main.cmake +@@ -4,9 +4,9 @@ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git) + find_package(Git 2.7 REQUIRED) + endif() + +-add_custom_target(git_revision ALL) + add_custom_command( +- TARGET git_revision ++# TARGET git_revision ++ OUTPUT ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src + + COMMAND ${CMAKE_COMMAND} +@@ -35,5 +35,8 @@ add_custom_command( + -P ${CMAKE_SOURCE_DIR}/CMake/Includes/git_revision_generate.cmake + COMMENT "Analyzing Git revision/tag changes..." VERBATIM + ) +- ++add_custom_target( ++ git_revision ++ DEPENDS ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp ++) + add_dependencies(${PROJECT_NAME} git_revision) |