Commit 45f39945 authored by Paul Harris's avatar Paul Harris Committed by Daniel Stenberg
Browse files

cmake: offer CMAKE_DEBUG_POSTFIX when building with MSVC 

Removes BUILD_RELEASE_DEBUG_DIRS since it wasn't used anywhere.

Closes #1649
parent bbc9c6d1

CMakeLists.txt

+3 −5
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ if (ENABLE_CURLDEBUG) 
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS CURLDEBUG)

endif()



# For debug libs and exes, add "-d" postfix

set(CMAKE_DEBUG_POSTFIX "-d" CACHE STRING "Set debug library postfix" FORCE)



# initialize CURL_LIBS

set(CURL_LIBS "")
@@ -118,11 +121,6 @@ if(ENABLE_ARES) 
  set(CURL_LIBS ${CURL_LIBS} ${CARES_LIBRARY})

endif()



if(MSVC)

  option(BUILD_RELEASE_DEBUG_DIRS "Set OFF to build each configuration to a separate directory" OFF)

  mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS)

endif()



include(CurlSymbolHiding)



option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF)

lib/CMakeLists.txt

+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,13 @@ 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")



    set_target_properties (${LIB_NAME} PROPERTIES

       DEBUG_POSTFIX "-d"

       # Note: no postfix for release variants, let user choose what style of release he wants

       # MINSIZEREL_POSTFIX "-z"

       # RELWITHDEBINFO_POSTFIX "-g"

       )

  endif()

endif()