generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Fix for MSVC2010 project generation

Browse Source 
Fixed issue with static build for MSVC2010.

After some investigation I've discovered known issue
http://public.kitware.com/Bug/view.php?id=11240 When .rc file is linked
to static lib it fails with following linker error

LINK : warning LNK4068: /MACHINE not specified; defaulting to X86
file.obj : fatal error LNK1112: module machine type 'x64' conflicts with
target machine type 'X86'

Fix add target property /MACHINE: for MSVC generation.

Also removed old workarounds - it caused errors during msvc build.

Bug: http://curl.haxx.se/mail/lib-2013-07/0046.html
This commit is contained in:
Sergei Nikulov
2013-07-09 19:20:41 +04:00
committed by Daniel Stenberg
parent 7b115cc1e1
commit 448d55ef0a
4 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CMakeLists.txt
View File

@@ -94,6 +94,10 @@ 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)
@@ -108,14 +112,6 @@ setup_curl_dependencies(${LIB_NAME})
set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
set_target_properties(${LIB_NAME} PROPERTIES IMPORT_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(WIN32)
if(NOT CURL_STATICLIB) if(NOT CURL_STATICLIB)
# Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib" # Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib"

7
src/CMakeLists.txt
View File

@@ -46,13 +46,6 @@ target_link_libraries( ${EXE_NAME} libcurl )
set_target_properties(${EXE_NAME} PROPERTIES set_target_properties(${EXE_NAME} PROPERTIES
DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
if(MSVC)
if(NOT BUILD_RELEASE_DEBUG_DIRS)
# Ugly workaround to remove the "/debug" or "/release" in each output
set_target_properties(${EXE_NAME} PROPERTIES PREFIX "../")
endif()
endif()
#INCLUDE(ModuleInstall OPTIONAL) #INCLUDE(ModuleInstall OPTIONAL)
install(TARGETS ${EXE_NAME} DESTINATION bin) install(TARGETS ${EXE_NAME} DESTINATION bin)

8
tests/libtest/CMakeLists.txt
View File

@@ -25,14 +25,6 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
set_target_properties(${TEST_NAME} set_target_properties(${TEST_NAME}
PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
if(MSVC)
if(NOT BUILD_RELEASE_DEBUG_DIRS)
# Ugly workaround to remove the "/debug" or "/release" in each output
set_target_properties(${TEST_NAME} PROPERTIES PREFIX "../")
set_target_properties(${TEST_NAME} PROPERTIES IMPORT_PREFIX "../")
endif()
endif()
endfunction() endfunction()

8
tests/server/CMakeLists.txt
View File

@@ -33,14 +33,6 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
set_target_properties(${TEST_NAME} PROPERTIES set_target_properties(${TEST_NAME} PROPERTIES
DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
if(MSVC)
if(NOT BUILD_RELEASE_DEBUG_DIRS)
# Ugly workaround to remove the "/debug" or "/release" in each output
set_target_properties(${TEST_NAME} PROPERTIES PREFIX "../")
set_target_properties(${TEST_NAME} PROPERTIES IMPORT_PREFIX "../")
endif()
endif()
endfunction() endfunction()