From 31e8e37dbde0814d920fe7b0af209f8014e6dcda Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 20 Apr 2010 11:23:08 +0000 Subject: [PATCH] From Jason Beverage, "Here is a fix to the curl plugin CMake to allow it to link against the CURL_LIBRARY_DEBUG and ZLIB_LIBRARY_DEBUG. Previously it linked the debug version against the release libs, which was causing a hang when running in debug mode on Windows." --- src/osgPlugins/curl/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt index a65ec32f2..f20ea6284 100644 --- a/src/osgPlugins/curl/CMakeLists.txt +++ b/src/osgPlugins/curl/CMakeLists.txt @@ -21,10 +21,13 @@ SET(TARGET_H ReaderWriterCURL.h ) -IF(ZLIB_FOUND) - SET(TARGET_EXTERNAL_LIBRARIES ${CURL_LIBRARY} ${ZLIB_LIBRARY}) +IF(ZLIB_FOUND) + SET(TARGET_LIBRARIES_VARS + CURL_LIBRARY + ZLIB_LIBRARY) ELSE() - SET(TARGET_EXTERNAL_LIBRARIES ${CURL_LIBRARY}) + SET(TARGET_LIBRARIES_VARS + CURL_LIBRARY) ENDIF() IF(WIN32 OR MINGW)