Removed the "lib" prefix under linux ("was "liblibcurl") and fixed import library name under Win32 (Added "_imp" for dynamically linked).
This commit is contained in:
parent
edd02607e2
commit
2362637e90
@ -224,12 +224,21 @@ ENDIF()
|
|||||||
# ADD_DEFINITIONS( -DUSE_SSLEAY )
|
# ADD_DEFINITIONS( -DUSE_SSLEAY )
|
||||||
# ENDIF()
|
# ENDIF()
|
||||||
|
|
||||||
# IF(MSVC)
|
# Remove the "lib" prefix since the library is already named "libcurl".
|
||||||
# IF(NOT BUILD_RELEASE_DEBUG_DIRS)
|
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "")
|
||||||
# # Ugly workaround to remove the "/debug" or "/release" in each output
|
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "")
|
||||||
# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../")
|
|
||||||
# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
|
IF(MSVC)
|
||||||
# ENDIF()
|
IF(NOT BUILD_RELEASE_DEBUG_DIRS)
|
||||||
# # Add "_imp" as a suffix before the extension
|
# Ugly workaround to remove the "/debug" or "/release" in each output
|
||||||
# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
|
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../")
|
||||||
# ENDIF()
|
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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user