diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 16:24:47 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 16:24:47 -0800 |
| commit | 2f0da1a854b0e433e92d37bd665feb8fea34ac15 (patch) | |
| tree | ef78d63bcc6e6e6ac6dee1ba9347b57998dfb8ff | |
| parent | b66679e2cb910f60047fec269945d060d665cb9f (diff) | |
| download | vcpkg-2f0da1a854b0e433e92d37bd665feb8fea34ac15.tar.gz vcpkg-2f0da1a854b0e433e92d37bd665feb8fea34ac15.zip | |
[box2d] Use vcpkg_build_msbuild instead of invoking msbuild/devenv directly.
| -rw-r--r-- | ports/box2d/portfile.cmake | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index b7f101915..e35242bb7 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -1,10 +1,8 @@ include(${CMAKE_TRIPLET_FILE}) -# Get architecture params -set(PROJECT_ARCH "x64") -set(PROJECT_ARCH_BITS "${PROJECT_ARCH}") +# Get output directory +set(PROJECT_ARCH_BITS "x64") if(TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(PROJECT_ARCH "Win32") set(PROJECT_ARCH_BITS "x32") elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm") message(FATAL_ERROR "ARM not supported") @@ -47,36 +45,27 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/box2d/License.txt ${CURRENT_PACKAGES_D message(STATUS "Packaging license done") # Building: -set(PROJECT "./Box2D/Build/vs2015/Box2D.vcxproj") set(OUTPUTS_PATH "${SOURCE_PATH}/Box2D/Build/vs2015/bin/${PROJECT_ARCH_BITS}") -foreach(TYPE "Release" "Debug") - message(STATUS "Building ${TARGET_TRIPLET}-${TYPE}") - vcpkg_execute_required_process( - COMMAND "devenv.exe" - "./Box2D/Build/vs2015/Box2D.sln" - /Build "${TYPE}|${PROJECT_ARCH}" - /Project "${PROJECT}" - /Projectconfig "${TYPE}|${PROJECT_ARCH}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-${TYPE} - ) - message(STATUS "Building ${TARGET_TRIPLET}-${TYPE} done") +vcpkg_build_msbuild(PROJECT_PATH ${SOURCE_PATH}/Box2D/Build/vs2015/Box2D.vcxproj) - set(TARGET_PATH "${CURRENT_PACKAGES_DIR}") - if(TYPE STREQUAL Debug) - set(TARGET_PATH "${CURRENT_PACKAGES_DIR}/debug") - endif(TYPE STREQUAL Debug) +message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib") +file( + INSTALL ${OUTPUTS_PATH}/Release/ + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + FILES_MATCHING PATTERN "*.lib" +) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/lib/box2d.lib) +message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib done") - message(STATUS "Packaging ${TARGET_TRIPLET}-${TYPE} lib") - file( - INSTALL ${OUTPUTS_PATH}/${TYPE}/ - DESTINATION ${TARGET_PATH}/lib - FILES_MATCHING PATTERN "*.lib" - ) - file(RENAME ${TARGET_PATH}/lib/Box2D.lib ${TARGET_PATH}/lib/box2d.lib) - message(STATUS "Packaging ${TARGET_TRIPLET}-${TYPE} lib done") -endforeach(TYPE "Release" "Debug") +message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib") +file( + INSTALL ${OUTPUTS_PATH}/Debug/ + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + FILES_MATCHING PATTERN "*.lib" +) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/debug/lib/box2d.lib) +message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib done") message(STATUS "Packaging headers") file( |