fly/flightgear
1
0
Fork 0
Code Activity

XMerge branch 'next' of ssh://git.code.sf.net/p/flightgear/flightgear into next

Browse source
This commit is contained in:
Erik Hofman 2020-08-23 19:22:47 +02:00
commit be1764a995
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
3rdparty/fonts/CMakeLists.txt vendored
View file

@ -7,8 +7,11 @@ set (FNT_SOURCES
add_library(PLIBFont STATIC ${FNT_SOURCES}) add_library(PLIBFont STATIC ${FNT_SOURCES})
target_link_libraries(PLIBFont SimGearCore) target_link_libraries(PLIBFont SimGearCore )
target_include_directories(PLIBFont PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # we use <osg/GL> in fnt.h, so we need to use it
target_include_directories(PLIBFont PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${OPENSCENEGRAPH_INCLUDE_DIRS})

14
CMakeLists.txt
View file

@ -463,8 +463,8 @@ configure_file (
# Setup build.h header, each build # Setup build.h header, each build
include( GenerateBuildInfo ) include( GenerateBuildInfo )
# global includes: these are used by every singl target, so we do set them globally # global includes: these are used by every single target, so we do set them globally
# even though that's not stricly best practice # even though that's not strictly best practice
include_directories(${PROJECT_BINARY_DIR}/src/Include) include_directories(${PROJECT_BINARY_DIR}/src/Include)
include_directories(${PROJECT_BINARY_DIR}/src) # for version.h include_directories(${PROJECT_BINARY_DIR}/src) # for version.h
include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src)
@ -482,15 +482,7 @@ add_subdirectory(scripts)
### MSVC startup project - ensure you can just hit build & run in MSVC ### MSVC startup project - ensure you can just hit build & run in MSVC
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT fgfs) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT fgfs)
#----------------------------------------------------------------------------- include(Installation)
### uninstall target
#-----------------------------------------------------------------------------
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
# The test suite. # The test suite.
enable_testing() enable_testing()

11
CMakeModules/Installation.cmake
View file

@ -14,3 +14,14 @@ if (TARGET sentry_crashpad::handler)
install(FILES $<TARGET_FILE:sentry_crashpad::handler> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) install(FILES $<TARGET_FILE:sentry_crashpad::handler> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
endif() endif()
endif() endif()
#-----------------------------------------------------------------------------
### uninstall target
#-----------------------------------------------------------------------------
CONFIGURE_FILE(
"${PROJECT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
"${PROJECT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake")

3
test_suite/CMakeLists.txt
View file

@ -142,6 +142,9 @@ setup_fgfs_libraries(fgfs_test_suite)
# Additional search paths for includes. # Additional search paths for includes.
setup_fgfs_includes(fgfs_test_suite) setup_fgfs_includes(fgfs_test_suite)
# test codce includes its headers as test_suite/foo.h, so we need this
target_include_directories(fgfs_test_suite PUBLIC ${PROJECT_SOURCE_DIR})
target_compile_definitions(fgfs_test_suite PUBLIC BUILDING_TESTSUITE) target_compile_definitions(fgfs_test_suite PUBLIC BUILDING_TESTSUITE)
# Additional libraries just for the test suite. # Additional libraries just for the test suite.