This is an automated email from the ASF dual-hosted git repository. jmalkin pushed a commit to branch py_setup in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit 4fcad9d25c2c3e988e654e02b86f0b3cd611d2f5 Author: jmalkin <[email protected]> AuthorDate: Thu Jun 20 10:41:03 2019 -0700 clean up cmake files so python compiles --- common/CMakeLists.txt | 1 + cpc/CMakeLists.txt | 2 +- fi/CMakeLists.txt | 10 +++++++++- hll/CMakeLists.txt | 4 ++-- kll/CMakeLists.txt | 10 +++++++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 16a92c9..aeda58f 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -12,6 +12,7 @@ target_include_directories(common target_sources(common INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/MurmurHash3.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/serde.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/CommonUtil.hpp ) diff --git a/cpc/CMakeLists.txt b/cpc/CMakeLists.txt index 159dc2c..4d6075e 100644 --- a/cpc/CMakeLists.txt +++ b/cpc/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(cpc PROPERTIES ) install(TARGETS cpc - EXPORT ${PROJCT_NAME} + EXPORT ${PROJECT_NAME} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches ) diff --git a/fi/CMakeLists.txt b/fi/CMakeLists.txt index 7cd27d2..42c3929 100644 --- a/fi/CMakeLists.txt +++ b/fi/CMakeLists.txt @@ -10,12 +10,20 @@ target_include_directories(fi INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include> + PRIVATE + ${COMMON_INCLUDE_DIR} +) + +target_link_libraries(fi INTERFACE common) + +set_target_properties(fi PROPERTIES + INTERFACE_COMPILE_FEATURES cxx_std_11 ) set(fi_HEADERS "include/frequent_items_sketch.hpp;include/reverse_purge_hash_map.hpp") install(TARGETS fi - EXPORT ${PROJCT_NAME} + EXPORT ${PROJECT_NAME} ) install(FILES ${fi_HEADERS} diff --git a/hll/CMakeLists.txt b/hll/CMakeLists.txt index d7f5e8e..e75d466 100644 --- a/hll/CMakeLists.txt +++ b/hll/CMakeLists.txt @@ -14,7 +14,7 @@ target_include_directories(hll ${COMMON_INCLUDE_DIR} ) -target_link_libraries(hll common) +target_link_libraries(hll INTERFACE common) set_target_properties(hll PROPERTIES PUBLIC_HEADER "include/hll.hpp" @@ -24,7 +24,7 @@ set_target_properties(hll PROPERTIES ) install(TARGETS hll - EXPORT ${PROJCT_NAME} + EXPORT ${PROJECT_NAME} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches ) diff --git a/kll/CMakeLists.txt b/kll/CMakeLists.txt index 7a8d2d8..662d7a2 100644 --- a/kll/CMakeLists.txt +++ b/kll/CMakeLists.txt @@ -10,12 +10,20 @@ target_include_directories(kll INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include> + PRIVATE + ${COMMON_INCLUDE_DIR} +) + +target_link_libraries(kll INTERFACE common) + +set_target_properties(kll PROPERTIES + INTERFACE_COMPILE_FEATURES cxx_std_11 ) set(kll_HEADERS "include/kll_sketch.hpp;include/kll_helper.hpp;include/kll_quantile_calculator.hpp") install(TARGETS kll - EXPORT ${PROJCT_NAME} + EXPORT ${PROJECT_NAME} ) install(FILES ${kll_HEADERS} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
