etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-04-17 20:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor build fix on windows

Browse source
This commit is contained in:
jackeri 2013-12-31 12:29:38 +02:00
parent 645efa8c21
commit 52a2a00dcf
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -98,9 +98,12 @@ if(WIN32)
SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/curl
BINARY_DIR ${PROJECT_BINARY_DIR}/libs/curl
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_CURL_EXE=0 -DBUILD_CURL_TESTS=0 -DCURL_STATICLIB=1 -DCURL_USE_ARES=0 -DCURL_ZLIB=0 -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/curl
INSTALL_COMMAND ""
)
set(CURL_BUNDLED_LIBRARY "${PROJECT_BINARY_DIR}/curl/lib/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" wsock32 ws2_32 PARENT_SCOPE)
ExternalProject_Get_Property(bundled_curl binary_dir)
set(CURL_BUNDLED_LIBRARY "${binary_dir}/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" wsock32 ws2_32 PARENT_SCOPE)
set(CURL_BUNDLED_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/curl/include" PARENT_SCOPE)
endif(BUNDLED_CURL)
@ -464,10 +467,13 @@ if(BUNDLED_FREETYPE)
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(bundled_freetype binary_dir)
if(MSVC)
set(BUNDLED_FREETYPE_LIBRARIES "${PROJECT_BINARY_DIR}/libs/freetype/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE)
set(BUNDLED_FREETYPE_LIBRARIES "${binary_dir}/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE)
else()
set(BUNDLED_FREETYPE_LIBRARIES "${PROJECT_BINARY_DIR}/libs/freetype/libfreetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE)
set(BUNDLED_FREETYPE_LIBRARIES "${binary_dir}/libfreetype${CMAKE_STATIC_LIBRARY_SUFFIX}" PARENT_SCOPE)
endif()
set(BUNDLED_FREETYPE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/freetype/include" PARENT_SCOPE)
endif(BUNDLED_FREETYPE)