This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 28ee31149030c75c32ebbf134502a9d020dbd54b (commit)
via 21c74faa1ad75aa52d465467908edcb888cb53bf (commit)
from 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28ee31149030c75c32ebbf134502a9d020dbd54b
commit 28ee31149030c75c32ebbf134502a9d020dbd54b
Merge: 9860b4c 21c74fa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 20 14:03:48 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon May 20 10:04:00 2019 -0400
Merge topic 'FindPNG-static-define'
21c74faa1a FindPNG: Fix definitions on imported target
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Paolo Lammens <lammenspa...@gmail.com>
Merge-request: !3337
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21c74faa1ad75aa52d465467908edcb888cb53bf
commit 21c74faa1ad75aa52d465467908edcb888cb53bf
Author: Axel Huebl <axel.huebl@plasma.ninja>
AuthorDate: Fri May 17 17:08:37 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 17 12:07:18 2019 -0400
FindPNG: Fix definitions on imported target
The `INTERFACE_COMPILE_DEFINITIONS` property should not have ``-D``
in its value.
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 2208b48..a7908c5 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -100,13 +100,14 @@ if(ZLIB_FOUND)
# No need to define PNG_USE_DLL here, because it's default for
Cygwin.
else()
set (PNG_DEFINITIONS -DPNG_STATIC)
+ set(_PNG_COMPILE_DEFINITIONS PNG_STATIC)
endif()
endif ()
if(NOT TARGET PNG::PNG)
add_library(PNG::PNG UNKNOWN IMPORTED)
set_target_properties(PNG::PNG PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+ INTERFACE_COMPILE_DEFINITIONS "${_PNG_COMPILE_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
if(EXISTS "${PNG_LIBRARY}")
@@ -129,6 +130,8 @@ if(ZLIB_FOUND)
IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
endif()
endif()
+
+ unset(_PNG_COMPILE_DEFINITIONS)
endif ()
if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPNG.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
