diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-05-31 03:22:00 +0100 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2014-06-05 20:52:20 -0700 |
| commit | 001e84091b0a7bca03586e9aebd9103e9630bfa5 (patch) | |
| tree | 52cbec8a8dbd4a67f509585a2b072116e3fc9a00 /src | |
| parent | d62f8178f9f29a5ab2942d03fdc251544eec7edb (diff) | |
| download | waffle-001e84091b0a7bca03586e9aebd9103e9630bfa5.tar.gz | |
cmake: reformat/update install targets
Cleanup the formatting and add component for each build target.
The latter will allow us to use CPack to create a component
based installer for Windows.
Additionally install wflinfo to CMAKE_INSTALL_BINDIR rather
than hardcoding it to 'bin'.
v2: Tag html documentation as htmldocs COMPONENT. Suggested by Chad.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/waffle/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 5bdf9c4..848702c 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -16,4 +16,8 @@ if(waffle_on_mac) ) endif() -install(TARGETS wflinfo DESTINATION bin) +install( + TARGETS wflinfo + DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT utils + ) diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt index 10a0241..12cc567 100644 --- a/src/waffle/CMakeLists.txt +++ b/src/waffle/CMakeLists.txt @@ -175,8 +175,11 @@ set_target_properties(${waffle_libname} LINK_INTERFACE_LIBRARIES "" ) -install(TARGETS ${waffle_libname} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install( + TARGETS ${waffle_libname} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT libraries + ) # ---------------------------------------------------------------------------- # Target: waffle_static |