Merge 10.2 into 10.3

9f8871db · Marko Mäkelä · 497b6949 · ece30d47 · 9f8871db
Commit 9f8871db authored Aug 25, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cmake/package_name.cmake cmake/package_name.cmake +5 -1

No files found.
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -110,7 +110,11 @@ IF(NOT VERSION)
        SET(DEFAULT_MACHINE "x86")
      ENDIF()
    ENDIF()
+    IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
+      SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
+    ENDIF()
    IF(NOT PLATFORM)
      SET(PLATFORM ${DEFAULT_PLATFORM})
    ENDIF()