From cf21d7342cdba3179ca540f8dfd7496660a8e01b Mon Sep 17 00:00:00 2001 From: Jacker Date: Sun, 5 Oct 2014 22:05:17 +0300 Subject: [PATCH] made bundles libs play nice with visual studio --- CMakeLists.txt | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9f94352..10970357 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,13 +104,9 @@ if(WIN32) ExternalProject_Get_Property(bundled_curl binary_dir) if(VSTUDIO) - if(DEBUG_BUILD) - set(CURL_BUNDLED_LIBRARY "${binary_dir}/lib/Debug/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" wsock32 ws2_32 PARENT_SCOPE) - else(DEBUG_BUILD) - set(CURL_BUNDLED_LIBRARY "${binary_dir}/lib/Release/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" wsock32 ws2_32 PARENT_SCOPE) - endif(DEBUG_BUILD) + set(CURL_BUNDLED_LIBRARY optimized "${binary_dir}/lib/Release/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/Debug/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) else(VSTUDIO) - set(CURL_BUNDLED_LIBRARY "${binary_dir}/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" wsock32 ws2_32 PARENT_SCOPE) + set(CURL_BUNDLED_LIBRARY "${binary_dir}/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) endif(VSTUDIO) set(CURL_BUNDLED_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/curl/include" PARENT_SCOPE) endif(BUNDLED_CURL) @@ -461,11 +457,7 @@ if(BUNDLED_FREETYPE) ExternalProject_Get_Property(bundled_freetype binary_dir) if(VSTUDIO) - if(DEBUG_BUILD) - set(BUNDLED_FREETYPE_LIBRARIES "${binary_dir}/Debug/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) - else(DEBUG_BUILD) - set(BUNDLED_FREETYPE_LIBRARIES "${binary_dir}/Release/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) - endif(DEBUG_BUILD) + set(BUNDLED_FREETYPE_LIBRARIES optimized "${binary_dir}/Release/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/Debug/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) elseif(NMAKE_BUILD) set(BUNDLED_FREETYPE_LIBRARIES "${binary_dir}/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) else(VSTUDIO) @@ -491,11 +483,7 @@ if(BUNDLED_JANSSON) endif(WIN32 AND DEBUG_BUILD) if(VSTUDIO) - if(DEBUG_BUILD) - set(BUNDLED_JASSON_LIBRARIES "${binary_dir}/lib/Debug/${jansson_name}" PARENT_SCOPE) - else(DEBUG_BUILD) - set(BUNDLED_JASSON_LIBRARIES "${binary_dir}/lib/Release/${jansson_name}" PARENT_SCOPE) - endif(DEBUG_BUILD) + set(BUNDLED_JASSON_LIBRARIES optimized "${binary_dir}/lib/Release/jansson${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/Debug/jansson_d${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE) elseif(NMAKE_BUILD) set(BUNDLED_JASSON_LIBRARIES "${binary_dir}/lib/${jansson_name}" PARENT_SCOPE) else(VSTUDIO)