FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake fixes for Linux

Browse Source
This commit is contained in:
James Turner 2020-08-22 22:11:42 +01:00
parent 720a1fe7d2
commit 2ed15eebfd
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -246,11 +246,6 @@ else()
message(STATUS "Using built-in expat code") message(STATUS "Using built-in expat code")
endif(SYSTEM_EXPAT) endif(SYSTEM_EXPAT)
check_include_file(inttypes.h HAVE_INTTYPES_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H)
check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(windows.h HAVE_WINDOWS_H)
if(ENABLE_RTI) if(ENABLE_RTI)
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)

6
CMakeModules/AddSimGearTest.cmake
View File

@ -1,7 +1,7 @@
function(add_simgear_test _name _sources) function(add_simgear_test _name _sources)
add_executable(${_name} ${_sources}) add_executable(${_name} ${_sources})
target_link_libraries(${_name} SimGearCore) target_link_libraries(${_name} SimGearCore Threads::Threads)
# for simgear_config.h # for simgear_config.h
target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear) target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear)
@ -10,7 +10,7 @@ endfunction()
function(add_simgear_autotest _name _sources) function(add_simgear_autotest _name _sources)
add_executable(${_name} ${_sources}) add_executable(${_name} ${_sources})
target_link_libraries(${_name} SimGearCore) target_link_libraries(${_name} SimGearCore Threads::Threads)
# for simgear_config.h # for simgear_config.h
target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear) target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear)
@ -21,7 +21,7 @@ endfunction()
function(add_simgear_scene_autotest _name _sources) function(add_simgear_scene_autotest _name _sources)
add_executable(${_name} ${_sources}) add_executable(${_name} ${_sources})
target_link_libraries(${_name} SimGearScene) target_link_libraries(${_name} SimGearScene Threads::Threads)
# for simgear_config.h # for simgear_config.h
target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear) target_include_directories(${_name} PRIVATE ${PROJECT_BINARY_DIR}/simgear)

5
CMakeModules/CheckPOSIXFeatures.cmake
View File

@ -4,6 +4,11 @@ check_function_exists(mkdtemp HAVE_MKDTEMP)
check_function_exists(bcopy HAVE_BCOPY) check_function_exists(bcopy HAVE_BCOPY)
check_function_exists(mmap HAVE_MMAP) check_function_exists(mmap HAVE_MMAP)
check_include_file(inttypes.h HAVE_INTTYPES_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H)
check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(windows.h HAVE_WINDOWS_H)
if (NOT MSVC) if (NOT MSVC)
check_function_exists(timegm HAVE_TIMEGM) check_function_exists(timegm HAVE_TIMEGM)
if (NOT HAVE_TIMEGM) if (NOT HAVE_TIMEGM)

10
simgear/CMakeLists.txt
View File

@ -110,11 +110,6 @@ else()
endforeach() endforeach()
add_library(SimGearScene STATIC ${sceneSources}) add_library(SimGearScene STATIC ${sceneSources})
if(HAVE_INTTYPES_H)
# ShivaVG needs inttypes.h
target_compile_definitions(SimGearScene PRIVATE HAVE_INTTYPES_H)
endif()
endif(NOT SIMGEAR_HEADLESS) endif(NOT SIMGEAR_HEADLESS)
endif(SIMGEAR_SHARED) endif(SIMGEAR_SHARED)
@ -161,6 +156,11 @@ if(NOT SIMGEAR_HEADLESS)
${OPENSCENEGRAPH_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES}
) )
if(HAVE_INTTYPES_H)
# ShivaVG needs inttypes.h
target_compile_definitions(SimGearScene PRIVATE HAVE_INTTYPES_H)
endif()
target_link_libraries(SimGearScene PRIVATE target_link_libraries(SimGearScene PRIVATE
ZLIB::ZLIB ZLIB::ZLIB
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}