mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-10 07:40:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

SelectLibraryConfigurations: Do not cache the _LIBRARY variable

Browse Source 
SelectLibraryConfigurations module currently cache and mark as advanced
the variable ${basename}_LIBRARY.
${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG are usually
cached, because they often come from find_library().
${basename}_LIBRARY on the other hand is always of type
"optimized;${${basename}_LIBRARY_RELEASE};debug;${${basename}_LIBRARY_DEBUG}"
or just "${basename}_LIBRARY_RELEASE" or "${basename}_LIBRARY_DEBUG" if
only one version of the library is not found, if both have the same
value, or if configuration types are not supported.

Caching and marking as advanced just ${basename}_LIBRARY_RELEASE and
${basename}_LIBRARY_DEBUG is enough, just by modifying these two
variables, the user has enough control on finding the library, and
having 3 variables is redundant and confusing.
This commit is contained in:
Daniele E. Domenichelli
2013-07-08 14:37:23 +02:00
parent a18e9586db
commit 07b44e7a1f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/SelectLibraryConfigurations.cmake
View File

@@ -73,15 +73,11 @@ macro( select_library_configurations basename )
endif() endif()
endif() endif()
set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH
"The ${basename} library" )
if( ${basename}_LIBRARY ) if( ${basename}_LIBRARY )
set( ${basename}_FOUND TRUE ) set( ${basename}_FOUND TRUE )
endif() endif()
mark_as_advanced( ${basename}_LIBRARY mark_as_advanced( ${basename}_LIBRARY_RELEASE
${basename}_LIBRARY_RELEASE
${basename}_LIBRARY_DEBUG ${basename}_LIBRARY_DEBUG
) )
endmacro() endmacro()