diff options
| author | xiphon <xiphon@protonmail.com> | 2018-10-13 09:46:19 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2018-10-13 09:46:37 +0000 |
| commit | bf842a6a1e1e0a983d7c37ea7564b7f19d8544b1 (patch) | |
| tree | 2febce319c0f32bb319959b70747bf5a311a5072 /CMakeLists.txt | |
| parent | Merge pull request #4543 (diff) | |
| download | monero-bf842a6a1e1e0a983d7c37ea7564b7f19d8544b1.tar.xz | |
build: use ARCH 'native' by default, allow to configure and override it
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bffd29b6..78d16b2ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ if (IOS) endif() cmake_minimum_required(VERSION 2.8.7) +message(STATUS "CMake version ${CMAKE_VERSION}") project(monero) @@ -139,7 +140,6 @@ if(ARCH_ID STREQUAL "ppc64le") set(PPC64LE 1) set(PPC64 0) set(PPC 0) - endif() if(ARCH_ID STREQUAL "powerpc64" OR ARCH_ID STREQUAL "ppc64") @@ -517,10 +517,8 @@ if(MSVC) include_directories(SYSTEM src/platform/msc) else() include(TestCXXAcceptsFlag) - if (NOT ARM6) - if(NOT DEPENDS OR DEPENDS AND NOT ARM) - set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") - endif() + if (NOT ARCH) + set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") endif() message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}") if(ARCH STREQUAL "default") |