kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl: Drop inclusion of .rc file for static lib 

The resource file is only needed for the curl .dll, so skip it when
building the static library.  This avoids the need to add the
'/machine:' link flag on MS tools for creating a static library.
This commit is contained in:
Brad King 2014-11-06 15:31:38 -05:00
parent 860f0a2ddc
commit b18c904412
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/cmcurl/lib/CMakeLists.txt
View File

@ -13,7 +13,7 @@ list(APPEND HHEADERS
${CURL_BINARY_DIR}/include/curl/curlbuild.h ${CURL_BINARY_DIR}/include/curl/curlbuild.h
) )
if(MSVC) if(MSVC AND NOT CURL_STATICLIB)
list(APPEND CSOURCES libcurl.rc) list(APPEND CSOURCES libcurl.rc)
endif() endif()
@ -94,10 +94,6 @@ add_library(
${HHEADERS} ${CSOURCES} ${HHEADERS} ${CSOURCES}
) )
if(MSVC AND CURL_STATICLIB)
set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
endif()
target_link_libraries(${LIB_NAME} ${CURL_LIBS}) target_link_libraries(${LIB_NAME} ${CURL_LIBS})
if(WIN32) if(WIN32)