diff options
| author | Lars Ivar Hatledal <larsivarhatledal@gmail.com> | 2019-01-09 00:02:25 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-08 15:02:25 -0800 |
| commit | 6ce206c785d0881f21e2f9e53bb03ce946db23a6 (patch) | |
| tree | 36634522f5cf6b43b314ddfc17dbe2acd4be8ed1 | |
| parent | fbabe0797ca1dd40e69fbbafe79e8cb456f19072 (diff) | |
| download | vcpkg-6ce206c785d0881f21e2f9e53bb03ce946db23a6.tar.gz vcpkg-6ce206c785d0881f21e2f9e53bb03ce946db23a6.zip | |
[fmilib] fmilib not building on x64-windows (#4999)
* fix fmilib not building on x64-windows
* [fmilib] bump dash version in control file
This will force a rebuild when updating
* only search for MSVC generator on windows
| -rw-r--r-- | ports/fmilib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fmilib/portfile.cmake | 40 |
2 files changed, 37 insertions, 5 deletions
diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL index 859098e30..aa6b868d5 100644 --- a/ports/fmilib/CONTROL +++ b/ports/fmilib/CONTROL @@ -1,3 +1,3 @@ Source: fmilib
-Version: 2.0.3
+Version: 2.0.3-1
Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/
diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index df72dd7ee..5692b7d12 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -69,6 +69,36 @@ SET(OPTIONS file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR})
+if (WIN32)
+
+ if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013 ARM")
+
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015 ARM")
+
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017 ARM")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017")
+ else()
+ message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
+ endif()
+
+endif()
+
foreach(BUILDTYPE "rel" "dbg")
message("Building ${TARGET_TRIPLET}-${BUILDTYPE}...")
@@ -81,10 +111,12 @@ foreach(BUILDTYPE "rel" "dbg") file(REMOVE_RECURSE ${BUILD_DIR})
file(MAKE_DIRECTORY ${BUILD_DIR})
- if(RELEASE_BUILD)
- SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})
- else()
- SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}/debug)
+ SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})
+ if(WIN32)
+ SET(OPTIONS ${OPTIONS} -G ${GENERATOR})
+ endif()
+ if(NOT RELEASE_BUILD)
+ STRING(APPEND FMILIB_INSTALL_PREFIX "/debug")
endif()
# Step 1: Configure
|