10000 fix cmake parameters coincidence by gnusi · Pull Request #7774 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

fix cmake parameters coincidence #7774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2018
Merged

fix cmake parameters coincidence #7774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix cmake parameters coincidence
  • Loading branch information
@gnusi
gnusi committed Dec 14, 2018
commit 0cc19eba062eaa7c7a22278dd92f3aa26042d9c4
2 changes: 1 addition & 1 deletion 3rdParty/iresearch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif()
option(USE_TESTS "Build tests" OFF)
option(USE_PYRESEARCH "Build iresearch python bridge" OFF)
option(USE_VALGRIND "Use workarounds to avoid false positives in valgrind" OFF)
option(USE_OPTIMIZE_FOR_ARCHITECTURE "Use architecture specific low-level optimizations" OFF)
option(USE_SIMDCOMP "Use architecture specific low-level optimizations" OFF)

if (USE_VALGRIND)
add_definitions(-DIRESEARCH_VALGRIND)
Expand Down
6 changes: 3 additions & 3 deletions 3rdParty/iresearch/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ source_group("search" ./search/*)
source_group("store" ./store/*)
source_group("utils" ./utils/*)

if (USE_OPTIMIZE_FOR_ARCHITECTURE)
if (USE_SIMDCOMP)
set(IResearch_core_optimized_sources
./store/store_utils_optimized.cpp
)
Expand Down Expand Up @@ -488,7 +488,7 @@ else()
set(MSVC_ONLY_LIBRARIES "")
endif()

if (USE_OPTIMIZE_FOR_ARCHITECTURE)
if (USE_SIMDCOMP)
set(SIMD_LIBRARY_SHARED "simdcomp-shared")
set(SIMD_LIBRARY_STATIC "simdcomp-static")
endif()
Expand Down Expand Up @@ -902,7 +902,7 @@ endif()
### format plugin: format-1_0
################################################################################

if (USE_OPTIMIZE_FOR_ARCHITECTURE)
if (USE_SIMDCOMP)
set(FORMAT_10_EXTRA_DEFS "IRESEARCH_FORMAT10_CODEC=1")
else()
set(FORMAT_10_EXTRA_DEFS "IRESEARCH_FORMAT10_CODEC=0")
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/iresearch/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set(IResearchTests_INCLUDE_DIR
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if (USE_OPTIMIZE_FOR_ARCHITECTURE)
if (USE_SIMDCOMP)
set(IReSearch_tests_optimized_sources
./store/store_utils_optimized_tests.cpp
)
Expand Down
0