CMake fixes for Linux

CMakeLists.txt

@@ -246,11 +246,6 @@ else()
     message(STATUS "Using built-in expat code")
 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)
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)

CMakeModules/AddSimGearTest.cmake

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

CMakeModules/CheckPOSIXFeatures.cmake

@@ -4,6 +4,11 @@ check_function_exists(mkdtemp HAVE_MKDTEMP)
 check_function_exists(bcopy HAVE_BCOPY)
 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)
   check_function_exists(timegm HAVE_TIMEGM)
   if (NOT HAVE_TIMEGM)

simgear/CMakeLists.txt

@@ -110,11 +110,6 @@ else()
 		endforeach()
 
         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(SIMGEAR_SHARED)
 
@@ -161,6 +156,11 @@ if(NOT SIMGEAR_HEADLESS)
         ${OPENSCENEGRAPH_LIBRARIES}
     )
 
+    if(HAVE_INTTYPES_H)
+        # ShivaVG needs inttypes.h
+        target_compile_definitions(SimGearScene PRIVATE HAVE_INTTYPES_H)
+    endif()
+
     target_link_libraries(SimGearScene PRIVATE
         ZLIB::ZLIB
         ${OPENAL_LIBRARY}