diff --git a/CMakeLists.txt b/CMakeLists.txt index 05c44ad..64e4e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,10 @@ set(XTENSOR_SIGNAL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) # ========== set(XTENSOR_SIGNAL_CONFIG_FILE - "${XTENSOR_SIGNAL_INCLUDE_DIR}/xtensor-signal/xtensor_python_config.hpp") -file(STRINGS ${XTENSOR_SIGNAL_CONFIG_FILE} xtensor_python_version_defines + "${XTENSOR_SIGNAL_INCLUDE_DIR}/xtensor-signal/xtensor_signal.hpp") +file(STRINGS ${XTENSOR_SIGNAL_CONFIG_FILE} xtensor_signal_version_defines REGEX "#define XTENSOR_SIGNAL_VERSION_(MAJOR|MINOR|PATCH)") -foreach(ver ${xtensor_python_version_defines}) +foreach(ver ${xtensor_signal_version_defines}) if(ver MATCHES "#define XTENSOR_SIGNAL_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$") set(XTENSOR_SIGNAL_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "") endif() @@ -70,7 +70,7 @@ set(XTENSOR_SIGNAL_HEADERS add_library(xtensor-signal INTERFACE) target_include_directories(xtensor-signal INTERFACE - $ + $ $) target_link_libraries(xtensor-signal INTERFACE xtensor xsimd) diff --git a/environment-dev.yml b/environment-dev.yml index 50bce1e..3c653a9 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -7,6 +7,6 @@ dependencies: - ninja # Host dependencies - xsimd - - xtensor=0.24.0 + - xtensor=0.24.3 - doctest