Browse Source

CMake: Libraries: Update other Manglers to cleanup properly.

kestred 12 years ago
parent
commit
df87842516

+ 4 - 1
cmake/modules/MangleJPEG.cmake

@@ -21,4 +21,7 @@ if(JPEG_FOUND)
 	unset(JPEG_LIBRARIES)
 	unset(JPEG_LIBRARIES)
 	unset(JPEG_INCLUDE_DIR CACHE)
 	unset(JPEG_INCLUDE_DIR CACHE)
 	unset(JPEG_LIBRARY_DIR)
 	unset(JPEG_LIBRARY_DIR)
-endif()
+else()
+	unset(JPEG_LIBRARY CACHE)
+	unset(JPEG_INCLUDE_DIR CACHE)
+endif()

+ 3 - 1
cmake/modules/MangleOpenSSL.cmake

@@ -23,4 +23,6 @@ if(OPENSSL_FOUND)
 	unset(OPENSSL_LIBRARIES)
 	unset(OPENSSL_LIBRARIES)
 	unset(OPENSSL_INCLUDE_DIR CACHE)
 	unset(OPENSSL_INCLUDE_DIR CACHE)
 	unset(OPENSSL_LIBRARY_DIR)
 	unset(OPENSSL_LIBRARY_DIR)
-endif()
+else()
+	unset(OPENSSL_INCLUDE_DIR CACHE)
+endif()

+ 5 - 1
cmake/modules/ManglePNG.cmake

@@ -26,4 +26,8 @@ if(PNG_FOUND)
 	unset(PNG_PNG_INCLUDE_DIR CACHE)
 	unset(PNG_PNG_INCLUDE_DIR CACHE)
 	unset(PNG_LIBRARY_DIR)
 	unset(PNG_LIBRARY_DIR)
 	unset(PNG_VERSION_STRING)
 	unset(PNG_VERSION_STRING)
-endif()
+else()
+	unset(PNG_LIBRARY CACHE)
+	unset(PNG_INCLUDE_DIR CACHE)
+	unset(PNG_PNG_INCLUDE_DIR CACHE)
+endif()