From 40fbebb777e332ee41d09d038d8ae55ba164d1ab Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 31 Jan 2017 17:16:03 +0100 Subject: [PATCH] Move FGQCanvas install command This keeps standalone FGQCanvas build working. --- utils/CMakeLists.txt | 3 +++ utils/fgqcanvas/CMakeLists.txt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index fd4b1bbb7..e43edfbb2 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -37,4 +37,7 @@ endif() if (ENABLE_FGQCANVAS) add_subdirectory(fgqcanvas) + + # do this here so standalone build of FGQCanvas works + install(TARGETS fgqcanvas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/utils/fgqcanvas/CMakeLists.txt b/utils/fgqcanvas/CMakeLists.txt index 37df5eeb8..fb75c97ee 100644 --- a/utils/fgqcanvas/CMakeLists.txt +++ b/utils/fgqcanvas/CMakeLists.txt @@ -55,5 +55,3 @@ target_include_directories(fgqcanvas PRIVATE ${PROJECT_SOURCE_DIR}) # so ui_foo.h files are found target_include_directories(fgqcanvas PRIVATE ${PROJECT_BINARY_DIR}) - -install(TARGETS fgqcanvas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) \ No newline at end of file