diff options
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | dist/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 36d29ece0f1..a0fadafaa63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,12 +67,12 @@ add_subdirectory(vespalib) add_subdirectory(vespalog) add_subdirectory(vespamalloc) add_subdirectory(vsm) +# Note: Change when cmake gets proper post-install support. +# Post installation steps are run from dist subdirectory which needs to be the last add_subdirectory(...) call in this file. +add_subdirectory(dist) # Create module targets with name ${MODULE}+module depending on every target defined within that module __create_module_targets(TARGETS "module") # Create module targets with name ${MODULE}+test depending on every test target defined within that module __create_module_targets(TEST_TARGETS "test") - -# Post installation steps. Need to be the last install(...) call in this file. -install(CODE "execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/dist/post_install.sh ${CMAKE_INSTALL_PREFIX})") diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt new file mode 100644 index 00000000000..d06074074df --- /dev/null +++ b/dist/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(CODE "execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/post_install.sh ${CMAKE_INSTALL_PREFIX})") |