PackageMaker: Provide 32 bit binary on 32 bit build

Change-Id: Ia3d98056e3f4a857592d95eee546aa11e04334ed

diff --git a/PackageMaker/CMakeLists.txt b/PackageMaker/CMakeLists.txt
index 3521d3e..b8d5635 100644 (file)
--- a/PackageMaker/CMakeLists.txt
+++ b/PackageMaker/CMakeLists.txt
@@ -17,9 +17,18 @@
 # @brief   CMakeLists for tef-simulator TA Package Maker
 #
 
-SET(PACKAGE_MAKER_BINARIES
-    ${PACKAGE_MAKER_PATH}/TA_PackageBuilder.sh
-    ${PACKAGE_MAKER_PATH}/TAPackageMaker
-    )
+SET(PACKAGE_MAKER_SCRIPT ${PACKAGE_MAKER_PATH}/TA_PackageBuilder.sh)
 
-INSTALL(PROGRAMS ${PACKAGE_MAKER_BINARIES} DESTINATION ${BIN_DIR})
+SET(PACKAGE_MAKER_BINARY_NAME TAPackageMaker)
+
+IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    SET(PACKAGE_MAKER_BINARY "${PACKAGE_MAKER_PATH}/TAPackageMaker64")
+ELSEIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    SET(PACKAGE_MAKER_BINARY "${PACKAGE_MAKER_PATH}/TAPackageMaker32")
+ELSE()
+    MESSAGE(FATAL_ERROR "Incompatible architecture (only 32 and 64 bit archs are supported)")
+ENDIF()
+
+INSTALL(PROGRAMS ${PACKAGE_MAKER_SCRIPT} DESTINATION ${BIN_DIR})
+INSTALL(PROGRAMS ${PACKAGE_MAKER_BINARY} DESTINATION ${BIN_DIR}
+        RENAME ${PACKAGE_MAKER_BINARY_NAME})

diff --git a/PackageMaker/TAPackageMaker32 b/PackageMaker/TAPackageMaker32
new file mode 100755 (executable)
index 0000000..99a574d
Binary files /dev/null and b/PackageMaker/TAPackageMaker32 differ

diff --git a/PackageMaker/TAPackageMaker b/PackageMaker/TAPackageMaker64
similarity index 100%
rename from PackageMaker/TAPackageMaker
rename to PackageMaker/TAPackageMaker64