aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-03-19 20:33:20 -0700
committerGitHub <noreply@github.com>2018-03-19 20:33:20 -0700
commit6558f7bec63b6d3cd0944a0f67237072a287b499 (patch)
tree846ea90d302b7b248b648113e472aaeb3a6688bf
parent95a8f285d8757f40bbaff0d766e851ba7d82820d (diff)
parent8bed099d4c4f7bbabc6c17ddbe082fe534121fd0 (diff)
downloadvcpkg-6558f7bec63b6d3cd0944a0f67237072a287b499.tar.gz
vcpkg-6558f7bec63b6d3cd0944a0f67237072a287b499.zip
Merge pull request #3075 from past-due/sdl2_fix_vcpkg_build_type
[sdl2] Fix build failure when VCPKG_BUILD_TYPE is set
-rw-r--r--ports/sdl2/portfile.cmake11
1 files changed, 8 insertions, 3 deletions
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index a3cb80e3f..5d7ac5314 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -58,9 +58,14 @@ if(NOT BINS)
endif()
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib)
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib)
+ endif()
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib)
+ endif()
file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake)
foreach(SHARE_FILE ${SHARE_FILES})