fly/flightgear
1
0
Fork 0
Code Activity

Different solution for FGQCanvas install

Browse source 
Move the install line back inside the subdir, but pull in the extra
config file so the install-bindir is defined.
This commit is contained in:
James Turner 2017-02-04 08:25:41 +01:00
parent 311d59011c
commit 80e45f6d9b
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -265,7 +265,7 @@ if (MSVC)
if (CRASHRPT_FOUND) if (CRASHRPT_FOUND)
set(HAVE_CRASHRPT 1) set(HAVE_CRASHRPT 1)
message(STATUS "Using CrashRpt") message(STATUS "Using CrashRpt")
include_directories( ${CRASHRPT_INCLUDE_DIR}) include_directories( ${CRASHRPT_INCLUDE_DIR})
endif() endif()
endif() endif()

5
utils/CMakeLists.txt
View file

@ -37,9 +37,4 @@ endif()
if (ENABLE_FGQCANVAS) if (ENABLE_FGQCANVAS)
add_subdirectory(fgqcanvas) add_subdirectory(fgqcanvas)
if (TARGET fgqcanvas)
# do this here so standalone build of FGQCanvas works
install(TARGETS fgqcanvas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
endif() endif()

4
utils/fgqcanvas/CMakeLists.txt
View file

@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
include(GNUInstallDirs)
project(FGQCanvas) project(FGQCanvas)
find_package(Qt5 5.4 COMPONENTS Widgets WebSockets) find_package(Qt5 5.4 COMPONENTS Widgets WebSockets)
@ -55,3 +57,5 @@ target_include_directories(fgqcanvas PRIVATE ${PROJECT_SOURCE_DIR})
# so ui_foo.h files are found # so ui_foo.h files are found
target_include_directories(fgqcanvas PRIVATE ${PROJECT_BINARY_DIR}) target_include_directories(fgqcanvas PRIVATE ${PROJECT_BINARY_DIR})
install(TARGETS fgqcanvas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})