summaryrefslogtreecommitdiffstats
path: root/Modules/FindPNG.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 15:12:01 (GMT)
committerBrad King <brad.king@kitware.com>2016-08-03 15:14:29 (GMT)
commitff386d1121ec52854d522d3bb9c86fab286d58ef (patch)
tree3b1d9d71f628227661992346e791ebdd9f07fa80 /Modules/FindPNG.cmake
parent382c4fca6b895c2c7a68445918a8fd73a15e1f91 (diff)
downloadCMake-ff386d1121ec52854d522d3bb9c86fab286d58ef.zip
CMake-ff386d1121ec52854d522d3bb9c86fab286d58ef.tar.gz
CMake-ff386d1121ec52854d522d3bb9c86fab286d58ef.tar.bz2
Modules: Make imported targets fall back to `Release`
Find modules only detect Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091. This approach is recommended by documentation in `cmake-developer(7)` added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS target property for Find modules, 2014-12-04).
Diffstat (limited to 'Modules/FindPNG.cmake')
-rw-r--r--Modules/FindPNG.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 5050d91..d0dd870 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -126,13 +126,6 @@ if(ZLIB_FOUND)
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
IMPORTED_LOCATION "${PNG_LIBRARY}")
endif()
- if(EXISTS "${PNG_LIBRARY_DEBUG}")
- set_property(TARGET PNG::PNG APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(PNG::PNG PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
- IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
- endif()
if(EXISTS "${PNG_LIBRARY_RELEASE}")
set_property(TARGET PNG::PNG APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
@@ -140,6 +133,13 @@ if(ZLIB_FOUND)
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
IMPORTED_LOCATION_RELEASE "${PNG_LIBRARY_RELEASE}")
endif()
+ if(EXISTS "${PNG_LIBRARY_DEBUG}")
+ set_property(TARGET PNG::PNG APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(PNG::PNG PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+ IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
+ endif()
endif()
endif ()