[box2d][directxmesh][directxtex][directxtk][directxtk12][dxut][entityx][octomap][pdcurses][redshell][rttr][tbb][uvatlas] Improve constraint checking

13 files changed, 60 insertions, 2 deletions

diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake
index 8bfc5fb54..c84c33387 100644
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@@ -7,6 +7,10 @@ elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm")
     message(FATAL_ERROR "ARM not supported")
 endif(TRIPLET_SYSTEM_ARCH MATCHES "x86")
 
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "Box2d only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 
 if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 184784d48..51840b68f 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -10,6 +10,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(VCPKG_LIBRARY_LINKAGE static)

 endif()

 

+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")

+  message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")

+endif()

+

 include(vcpkg_common_functions)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXMesh-oct2016)

 vcpkg_download_distfile(ARCHIVE

diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 70bb16658..392290c06 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -10,6 +10,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(VCPKG_LIBRARY_LINKAGE static)

 endif()

 

+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")

+  message(FATAL_ERROR "DirectXTex only supports dynamic CRT linkage")

+endif()

+

 include(vcpkg_common_functions)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/directxtex-dec2016)

 vcpkg_download_distfile(ARCHIVE

diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index fc4418d75..5a751446c 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -3,6 +3,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "DirectXTk only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-dec2016)
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index e6f2fb4d8..6a545ccbd 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -3,6 +3,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "DirectXTk12 only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-dec2016)
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake
index 97dc8b2e3..cc12d769b 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -2,6 +2,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016)
 vcpkg_download_distfile(ARCHIVE_FILE
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
index d7bcdbe1b..d35fb9da3 100644
--- a/ports/entityx/portfile.cmake
+++ b/ports/entityx/portfile.cmake
@@ -11,6 +11,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "Entityx only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/entityx-1.2.0)
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake
index 96b7a6386..099a1ed78 100644
--- a/ports/octomap/portfile.cmake
+++ b/ports/octomap/portfile.cmake
@@ -1,3 +1,8 @@
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    message("Octomap does not currently support building purely static. Building dynamic instead.")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
 include(vcpkg_common_functions)
 set(GIT_REF "cefed0c1d79afafa5aeb05273cf1246b093b771c")
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/octomap-${GIT_REF})
diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake
index 1d94466dc..22268fdc0 100644
--- a/ports/pdcurses/portfile.cmake
+++ b/ports/pdcurses/portfile.cmake
@@ -1,4 +1,8 @@
 
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "PDCurses only supports dynamic CRT linkage")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET})
 find_program(NMAKE nmake)
diff --git a/ports/redshell/portfile.cmake b/ports/redshell/portfile.cmake
index c394d7013..d7fbec955 100644
--- a/ports/redshell/portfile.cmake
+++ b/ports/redshell/portfile.cmake
@@ -8,6 +8,15 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: redshell does not support UWP builds.")
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  message("Redshell only supports dynamic library linkage")
+  set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+
+if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+  message(FATAL_ERROR "Redshell only supports dynamic CRT linkage")
+endif()
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/redshell)
 
 vcpkg_from_github(
diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake
index 0a79ec2da..b590b7873 100644
--- a/ports/rttr/portfile.cmake
+++ b/ports/rttr/portfile.cmake
@@ -1,3 +1,8 @@
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  message("Rttr only supports dynamic library linkage")
+  set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rttr-0.9.5-src)
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 387762bcb..d633a9b23 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -2,8 +2,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     message(STATUS "Warning: Static building not supported yet. Building dynamic.")
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
-if (VCPKG_CRT_LINKAGE STREQUAL static OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
-    message(FATAL_ERROR "Build settings not supported")
+if (VCPKG_CRT_LINKAGE STREQUAL static)
+    message(FATAL_ERROR "TBB does not currently support static crt linkage")
+endif()
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    message(FATAL_ERROR "TBB does not currently support UWP")
 endif()
 
 include(vcpkg_common_functions)
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index 22b04326c..79dc605f1 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -10,6 +10,9 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")

     set(VCPKG_LIBRARY_LINKAGE static)

 endif()

+if (VCPKG_CRT_LINKAGE STREQUAL static)

+    message(FATAL_ERROR "UVAtlas does not currently support static crt linkage")

+endif()

 

 include(vcpkg_common_functions)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/UVAtlas-sept2016)