diff options
| author | Pierre Ossman <ossman@cendio.se> | 2011-03-03 12:35:04 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2011-03-03 12:35:04 +0000 |
| commit | 0bfc1cd41672532ec0c4ff9ad8ae51d2c2dd29cf (patch) | |
| tree | cb6b4f1470df2966bd9e54465d5f038cae5674e6 | |
| parent | 481b03ecd4699056314c2c8661538e8bddfd6265 (diff) | |
| download | tigervnc-0bfc1cd41672532ec0c4ff9ad8ae51d2c2dd29cf.tar.gz tigervnc-0bfc1cd41672532ec0c4ff9ad8ae51d2c2dd29cf.zip | |
Clean up the 64-bit handling a bit. Trust CMake to tell use when we have a
64-bit target, and we don't actually use the WIN64 variable anywhere.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4317 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | win/installer/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e855c407..9c692b91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,13 +60,7 @@ if(MSVC) add_definitions(-wd4244 -wd4267 -wd4800 -wd4996) endif() -# Detect whether compiler is 64-bit -if((MSVC AND CMAKE_CL_64) OR (CMAKE_SIZEOF_VOID_P MATCHES 8)) - set(64BIT 1) - set(WIN64 1) -endif() - -if(64BIT) +if(CMAKE_CL_64) message(STATUS "64-bit build") else() message(STATUS "32-bit build") diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt index 0324fe43..e09242c7 100644 --- a/win/installer/CMakeLists.txt +++ b/win/installer/CMakeLists.txt @@ -1,4 +1,4 @@ -if(64BIT) +if(CMAKE_CL_64) set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION}) set(INST_DEFS -DWIN64) else() |