10000 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel · lethalbrains/arangodb@5492a79 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5492a79

Browse files
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2 parents c14e9d2 + 9cbf7aa commit 5492a79

File tree

10 files changed

+326
-428
lines changed

10 files changed

+326
-428
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,12 @@ else ()
315315

316316
option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
317317

318-
if (USE_OPTIMIZE_FOR_ARCHITECTURE)
319-
include(OptimizeForArchitecture)
320-
OptimizeForArchitecture()
318+
if (NOT USE_OPTIMIZE_FOR_ARCHITECTURE)
319+
# mop: core2 (merom) is our absolute minimum!
320+
SET(TARGET_ARCHITECTURE "merom")
321321
endif ()
322+
include(OptimizeForArchitecture)
323+
OptimizeForArchitecture()
322324

323325
set(BASE_FLAGS "${Vc_ARCHITECTURE_FLAGS} ${BASE_FLAGS}")
324326
endif ()

0 commit comments

Comments
 (0)
0