Skip to content

Commit e6be85a

Browse files
authored
Merge pull request #55 from michaelbacci/feature-light-dependencies
fix: Install new headers
2 parents 3f6eeff + 0715e9f commit e6be85a

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ else()
7373
set(FFTW_USE_LONG_DOUBLE OFF)
7474
endif()
7575

76-
if(NOT FFTW_USE_FLOAT AND NOT FFTW_USE_DOUBLE AND NOT FFTW_USE_LONG_DOUBLE)
76+
if(NOT REQUIRE_FLOAT_LIB AND NOT REQUIRE_DOUBLE_LIB AND NOT REQUIRE_LONG_DOUBLE_LIB)
7777
message(FATAL_ERROR "Please, select at least one of the available FFTW type libraries")
7878
endif()
7979

@@ -177,7 +177,12 @@ endif(FIX_RPATH)
177177
#--------------------------------------- library contents
178178

179179
set(XTENSOR_FFTW_HEADERS
180+
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/basic_double.hpp
181+
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/basic_float.hpp
182+
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/basic_long_double.hpp
183+
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/basic_option.hpp
180184
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/basic.hpp
185+
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/common.hpp
181186
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/helper.hpp
182187
${XTENSOR_FFTW_INCLUDE_DIR}/xtensor-fftw/xtensor-fftw_config.hpp
183188
)

xtensor-fftwConfig.cmake.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@
1616

1717
@PACKAGE_INIT@
1818

19+
if(FFTW_USE_FLOAT)
20+
add_definitions(-DXTENSOR_FFTW_USE_FLOAT)
21+
endif()
22+
23+
if(FFTW_USE_DOUBLE)
24+
add_definitions(-DXTENSOR_FFTW_USE_DOUBLE)
25+
endif()
26+
27+
if(FFTW_USE_LONG_DOUBLE AND NOT MSVC)
28+
add_definitions(-DXTENSOR_FFTW_USE_LONG_DOUBLE)
29+
endif()
30+
31+
if(NOT FFTW_USE_FLOAT AND NOT FFTW_USE_DOUBLE AND NOT FFTW_USE_LONG_DOUBLE)
32+
message(FATAL_ERROR "Please, select at least one of the available FFTW type libraries")
33+
endif()
34+
1935
set(PN xtensor-fftw)
2036
set_and_check(${PN}_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
2137
set(${PN}_LIBRARY "")

0 commit comments

Comments
 (0)