This is an automated email from the ASF dual-hosted git repository. jmalkin pushed a commit to branch windows_fixes in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit 585d14c9de75b8cea24e2ec320b45cba1716b94b Author: Jon Malkin <[email protected]> AuthorDate: Fri Apr 17 00:58:36 2020 -0700 one more or to ||, cmake changes to help with windows paths --- cpc/test/CMakeLists.txt | 3 ++- fi/test/CMakeLists.txt | 3 ++- hll/test/CMakeLists.txt | 3 ++- kll/test/CMakeLists.txt | 3 ++- sampling/test/CMakeLists.txt | 3 ++- theta/include/theta_a_not_b_impl.hpp | 2 +- theta/test/CMakeLists.txt | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cpc/test/CMakeLists.txt b/cpc/test/CMakeLists.txt index 0d31219..00bb4c5 100644 --- a/cpc/test/CMakeLists.txt +++ b/cpc/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(cpc_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -#file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test/" CPC_TEST_BINARY_PATH) +#file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" CPC_TEST_BINARY_PATH) +#string(APPEND CPC_TEST_BINARY_PATH "/") #target_compile_definitions(cpc_test # PRIVATE # TEST_BINARY_INPUT_PATH="${CPC_TEST_BINARY_PATH}" diff --git a/fi/test/CMakeLists.txt b/fi/test/CMakeLists.txt index 51c020c..7a821cd 100644 --- a/fi/test/CMakeLists.txt +++ b/fi/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(fi_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/" FI_TEST_BINARY_PATH) +file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" FI_TEST_BINARY_PATH) +string(APPEND FI_TEST_BINARY_PATH "/") target_compile_definitions(fi_test PRIVATE TEST_BINARY_INPUT_PATH="${FI_TEST_BINARY_PATH}" diff --git a/hll/test/CMakeLists.txt b/hll/test/CMakeLists.txt index 17afb44..75a084e 100644 --- a/hll/test/CMakeLists.txt +++ b/hll/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(hll_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/" HLL_TEST_BINARY_PATH) +file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" HLL_TEST_BINARY_PATH) +string(APPEND HLL_TEST_BINARY_PATH "/") target_compile_definitions(hll_test PRIVATE TEST_BINARY_INPUT_PATH="${HLL_TEST_BINARY_PATH}" diff --git a/kll/test/CMakeLists.txt b/kll/test/CMakeLists.txt index 61747c2..c48d1b2 100644 --- a/kll/test/CMakeLists.txt +++ b/kll/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(kll_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/" KLL_TEST_BINARY_PATH) +file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" KLL_TEST_BINARY_PATH) +string(APPEND KLL_TEST_BINARY_PATH "/") target_compile_definitions(kll_test PRIVATE TEST_BINARY_INPUT_PATH="${KLL_TEST_BINARY_PATH}" diff --git a/sampling/test/CMakeLists.txt b/sampling/test/CMakeLists.txt index 886abb3..da0939c 100644 --- a/sampling/test/CMakeLists.txt +++ b/sampling/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(sampling_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/" SAMPLING_TEST_BINARY_PATH) +file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" SAMPLING_TEST_BINARY_PATH) +string(APPEND SAMPLING_TEST_BINARY_PATH "/") target_compile_definitions(sampling_test PRIVATE TEST_BINARY_INPUT_PATH="${SAMPLING_TEST_BINARY_PATH}" diff --git a/theta/include/theta_a_not_b_impl.hpp b/theta/include/theta_a_not_b_impl.hpp index 18f35ad..9a21920 100644 --- a/theta/include/theta_a_not_b_impl.hpp +++ b/theta/include/theta_a_not_b_impl.hpp @@ -40,7 +40,7 @@ compact_theta_sketch_alloc<A> theta_a_not_b_alloc<A>::compute(const theta_sketch if (a.is_empty()) return compact_theta_sketch_alloc<A>(a, ordered); if (a.get_seed_hash() != seed_hash_) throw std::invalid_argument("A seed hash mismatch"); if (b.get_seed_hash() != seed_hash_) throw std::invalid_argument("B seed hash mismatch"); - if (a.get_num_retained() == 0 or b.is_empty()) return compact_theta_sketch_alloc<A>(a, ordered); + if (a.get_num_retained() == 0 || b.is_empty()) return compact_theta_sketch_alloc<A>(a, ordered); const uint64_t theta = std::min(a.get_theta64(), b.get_theta64()); uint64_t* keys = nullptr; diff --git a/theta/test/CMakeLists.txt b/theta/test/CMakeLists.txt index fd92617..c7d3a5d 100644 --- a/theta/test/CMakeLists.txt +++ b/theta/test/CMakeLists.txt @@ -24,7 +24,8 @@ set_target_properties(theta_test PROPERTIES CXX_STANDARD_REQUIRED YES ) -file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/" THETA_TEST_BINARY_PATH) +file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" THETA_TEST_BINARY_PATH) +string(APPEND THETA_TEST_BINARY_PATH "/") target_compile_definitions(theta_test PRIVATE TEST_BINARY_INPUT_PATH="${THETA_TEST_BINARY_PATH}" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
