diff options
| -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() |