Jelajahi Sumber

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.
Brad King 11 tahun lalu
induk
melakukan
b18c904412
1 mengubah file dengan 1 tambahan dan 5 penghapusan
  1. 1 5
      Utilities/cmcurl/lib/CMakeLists.txt

+ 1 - 5
Utilities/cmcurl/lib/CMakeLists.txt

@@ -13,7 +13,7 @@ list(APPEND HHEADERS
   ${CURL_BINARY_DIR}/include/curl/curlbuild.h
   )
 
-if(MSVC)
+if(MSVC AND NOT CURL_STATICLIB)
   list(APPEND CSOURCES libcurl.rc)
 endif()
 
@@ -94,10 +94,6 @@ add_library(
   ${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})
 
 if(WIN32)