]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
2 | index 335808a..90772b4 100644 | |
3 | --- a/CMakeLists.txt | |
4 | +++ b/CMakeLists.txt | |
5 | @@ -358,7 +358,7 @@ foreach(subtarget ${subtargets}) | |
6 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | |
7 | endforeach () | |
8 | install(TARGETS ${fftw3_lib} | |
9 | - EXPORT FFTW3LibraryDepends | |
10 | + EXPORT FFTW3${PREC_SUFFIX}LibraryDepends | |
11 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | |
12 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | |
13 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | |
14 | @@ -419,11 +419,11 @@ configure_file (FFTW3ConfigVersion.cmake.in FFTW3${PREC_SUFFIX}ConfigVersion.cma | |
15 | install (FILES | |
16 | ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}Config.cmake | |
17 | ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}ConfigVersion.cmake | |
18 | - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX} | |
19 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake | |
20 | COMPONENT Development) | |
21 | ||
22 | -export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3LibraryDepends.cmake) | |
23 | -install(EXPORT FFTW3LibraryDepends | |
24 | +export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3${PREC_SUFFIX}LibraryDepends.cmake) | |
25 | +install(EXPORT FFTW3${PREC_SUFFIX}LibraryDepends | |
26 | NAMESPACE FFTW3:: | |
27 | - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX} | |
28 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake | |
29 | COMPONENT Development) | |
30 | --- a/FFTW3Config.cmake.in | |
31 | +++ b/FFTW3Config.cmake.in | |
32 | @@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@) | |
33 | set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@) | |
34 | set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@) | |
35 | ||
36 | -include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake") | |
37 | +include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3@PREC_SUFFIX@LibraryDepends.cmake") | |
38 | ||
39 | if (CMAKE_VERSION VERSION_LESS 2.8.3) | |
40 | set (CMAKE_CURRENT_LIST_DIR) | |
41 |