diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2013-08-19 22:45:54 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-08-19 23:46:53 -0700 |
| commit | 9bc242a130c1757a0d511ff7630830fca5042096 (patch) | |
| tree | d82396c58d6a2fd2b805c8821ee484383ca791df | |
| parent | 77db72ffa75f0ba5ac798982e993dd86488bf824 (diff) | |
cmake: Refactor installation of FindWaffle.cmake
The presence of file `cmake/CMakeLists.txt` feels very strange. I found
no other project that had a CMakeLists there. Goodbye strange file.
File `cmake/CMakeLists.txt` did exactly one thing: define the install
rule for `FindWaffle.cmake`. Kill the file and move the install rule to
the toplevel CMakeLists.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f6816c9..8eea7cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ include_directories( src ) -add_subdirectory(cmake) add_subdirectory(doc) add_subdirectory(pkg) add_subdirectory(src) @@ -96,7 +95,7 @@ if(waffle_build_tests) endif() # ------------------------------------------------------------------------------ -# Install: waffle.pc +# Install packaging files: waffle.pc, FindWaffle.cmake # ------------------------------------------------------------------------------ configure_file(waffle.pc.in ${waffle_libname}.pc @ONLY) @@ -104,6 +103,9 @@ configure_file(waffle.pc.in ${waffle_libname}.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) +install(FILES cmake/Modules/FindWaffle.cmake + DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/cmake/Modules") + # ------------------------------------------------------------------------------ include(WafflePrintConfigurationSummary) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt deleted file mode 100644 index 97befca..0000000 --- a/cmake/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -install(FILES Modules/FindWaffle.cmake - DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/cmake/Modules") |