Changeset 10963 for OpenSceneGraph/trunk/src/osgPlugins/curl/CMakeLists.txt

Timestamp:

01/18/10 15:27:20 (3 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay, build fixes for Mingw

Files:

• OpenSceneGraph/trunk/src/osgPlugins/curl/CMakeLists.txt (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/curl/CMakeLists.txt

@@ -1 @@
-#this file is automatically generated 
-
 OPTION(CURL_IS_STATIC "on if curl is a static lib " ON)
 MARK_AS_ADVANCED(CURL_IS_STATIC)
@@ -6 +4 @@
 IF(WIN32)
     SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
-    IF(CURL_IS_STATIC)
-        ADD_DEFINITIONS(-DCURL_STATICLIB)
-        SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm wldap32)
-    ENDIF()
 ENDIF()
 
@@ -20 +14 @@
 
 
-SET(TARGET_SRC 
+SET(TARGET_SRC
     ReaderWriterCURL.cpp
 )
@@ -29 +23 @@
 
 IF(ZLIB_FOUND)
-    SET(TARGET_LIBRARIES_VARS CURL_LIBRARY ZLIB_LIBRARY)
+    SET(TARGET_EXTERNAL_LIBRARIES ${CURL_LIBRARY} ${ZLIB_LIBRARY})
 ELSE()
-    SET(TARGET_LIBRARIES_VARS CURL_LIBRARY )
+    SET(TARGET_EXTERNAL_LIBRARIES ${CURL_LIBRARY})
 ENDIF()
 
+IF(WIN32 OR MINGW)
+    IF(CURL_IS_STATIC)
+        ADD_DEFINITIONS(-DCURL_STATICLIB)
+        SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32)
+    ENDIF()
+ENDIF()
 
 #### end var setup  ###