From: Benoit Neil <suky0001@free.fr>
Date: Mon, 6 Apr 2009 19:43:52 +0000 (+0000)
Subject: Removed the "lib" prefix under linux ("was "liblibcurl") and fixed import library... 
X-Git-Tag: curl-7_19_5~251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2362637e9049d01138ee8d4fd4c8cafb563f693a;p=curl

Removed the "lib" prefix under linux ("was "liblibcurl") and fixed import library name under Win32 (Added "_imp" for dynamically linked).
---

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a1dbfbcf8..f44abdf8b 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -224,12 +224,21 @@ ENDIF()
 	# ADD_DEFINITIONS( -DUSE_SSLEAY )
 # ENDIF()
 
-# IF(MSVC)
-	# IF(NOT BUILD_RELEASE_DEBUG_DIRS)
-		# # Ugly workaround to remove the "/debug" or "/release" in each output
-		# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../")
-		# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
-	# ENDIF()
-	# # Add "_imp" as a suffix before the extension
-	# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
-# ENDIF()
+# Remove the "lib" prefix since the library is already named "libcurl".
+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "")
+
+IF(MSVC)
+	IF(NOT BUILD_RELEASE_DEBUG_DIRS)
+		# Ugly workaround to remove the "/debug" or "/release" in each output
+		SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../")
+		SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
+	ENDIF()
+ENDIF()
+
+IF(WIN32)
+	IF(NOT CURL_STATICLIB)
+		# Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib"
+		SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
+	ENDIF()
+ENDIF()