moved 32-bit/64-bit detection into main CMakeLists

This commit is contained in:
Riccardo Spagni 2015-03-02 17:10:16 +02:00 committed by Thomas Winget
parent a0cbf733b6
commit 3b3da86483
No known key found for this signature in database
GPG Key ID: 58131A160789E630
58 changed files with 12 additions and 9 deletions

View File

@ -65,6 +65,15 @@ option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost inst
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
enable_testing() enable_testing()
# Check whether we're on a 32-bit or 64-bit system
if(CMAKE_SIZEOF_VOID_P EQUAL "8")
message(STATUS "Building on a 64-bit system")
set(ARCH_WIDTH "64")
else()
message(STATUS "Building on a 32-bit system")
set(ARCH_WIDTH "32")
endif()
# Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead) # Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead)
# CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists # CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists
if(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*") if(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*")

View File

@ -28,14 +28,8 @@
# We aren't even going to check the system for an installed LMDB driver, as it is too # We aren't even going to check the system for an installed LMDB driver, as it is too
# critical a consensus component to rely on dynamically linked libraries # critical a consensus component to rely on dynamically linked libraries
if(CMAKE_SIZEOF_VOID_P EQUAL "8") message(STATUS "Using ${ARCH_WIDTH}-bit LMDB from source tree")
message(STATUS "Using 64-bit LMDB from source tree") add_subdirectory(liblmdb${ARCH_WIDTH})
add_subdirectory(liblmdb) set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" PARENT_SCOPE)
set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb" PARENT_SCOPE)
else()
message(STATUS "Using 32-bit LMDB from source tree")
add_subdirectory(liblmdb-vl32)
set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb-vl32" PARENT_SCOPE)
endif()
set(LMDB_LIBRARY "lmdb" PARENT_SCOPE) set(LMDB_LIBRARY "lmdb" PARENT_SCOPE)