summaryrefslogtreecommitdiff
path: root/cmake/package_name.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-02-10 20:23:24 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-02-10 20:23:24 +0100
commit3bd236fefb0024fa4f304d50f8725fcd153631f1 (patch)
treedfea6a5cf6f617ecfe6559b0eff36aba6b474d05 /cmake/package_name.cmake
parent784d4a47187a960b43225d45a27ee0fe435603ea (diff)
downloadmariadb-git-3bd236fefb0024fa4f304d50f8725fcd153631f1.tar.gz
Add components to INSTALL, some eraly Wix support
Diffstat (limited to 'cmake/package_name.cmake')
-rw-r--r--cmake/package_name.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index d2998cfd795..6e6fe89e8b3 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -15,6 +15,8 @@
# Produce meaningful package name for the binary package
# The logic is rather involved with special cases for different OSes
+INCLUDE(CheckTypeSize)
+CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
MACRO(GET_PACKAGE_FILE_NAME Var)
IF(NOT VERSION)
MESSAGE(FATAL_ERROR
@@ -24,7 +26,8 @@ IF(NOT VERSION)
SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 1)
SET(DEFAULT_PLATFORM ${CMAKE_SYSTEM_NAME})
SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
- IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ MESSAGE("SIZEOF_VOIDP=${SIZEOF_VOIDP}")
+ IF(SIZEOF_VOIDP EQUAL 8)
SET(64BIT 1)
ENDIF()