summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Thiel <bthiel@gwdg.de>2013-05-28 09:25:00 (GMT)
committerBrad King <brad.king@kitware.com>2013-07-02 12:21:16 (GMT)
commitc4bcc56156596174ee510c1986b6003f2d84bebf (patch)
tree243f6d8f40ef80b324dcb2b284db5e57c6fa2eca
parent5dd8c01429da90a7417b72f17e784cc98f70f57c (diff)
downloadCMake-c4bcc56156596174ee510c1986b6003f2d84bebf.zip
CMake-c4bcc56156596174ee510c1986b6003f2d84bebf.tar.gz
CMake-c4bcc56156596174ee510c1986b6003f2d84bebf.tar.bz2
SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
The line set( ${basename}_LIBRARY ) removes the normal variable, but if the corresponding cached variable is present then line list( APPEND ${basename}_LIBRARY optimized "${_libname}" ) uses that and fails. Replace the original line with set( ${basename}_LIBRARY "" ) to set the normal variable to empty instead of unsetting it.
-rw-r--r--Modules/SelectLibraryConfigurations.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/SelectLibraryConfigurations.cmake b/Modules/SelectLibraryConfigurations.cmake
index 62137bb..5bca064 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -62,7 +62,7 @@ macro( select_library_configurations basename )
# if the generator supports configuration types or CMAKE_BUILD_TYPE
# is set, then set optimized and debug options.
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
- set( ${basename}_LIBRARY )
+ set( ${basename}_LIBRARY "" )
foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
endforeach()