fly/flightgear
1
0
Fork 0
Code Activity

Main: Formatting standardization for the src/Main/CMakeLists.txt file.

Browse source 
This includes spacing, tab to space replacements, and alphabetical ordering.
This commit is contained in:
Edward d'Auvergne 2018-03-02 22:18:28 +01:00
parent 8b438cb97e
commit 941c5dc8f2
1 changed files with 78 additions and 73 deletions

37
src/Main/CMakeLists.txt
View file

@ -6,10 +6,10 @@ endif (MSVC)
set(SOURCES set(SOURCES
bootstrap.cxx bootstrap.cxx
fg_commands.cxx fg_commands.cxx
fg_scene_commands.cxx
fg_init.cxx fg_init.cxx
fg_io.cxx fg_io.cxx
fg_os_common.cxx fg_os_common.cxx
fg_scene_commands.cxx
fg_props.cxx fg_props.cxx
FGInterpolator.cxx FGInterpolator.cxx
globals.cxx globals.cxx
@ -17,15 +17,16 @@ set(SOURCES
logger.cxx logger.cxx
main.cxx main.cxx
options.cxx options.cxx
util.cxx
positioninit.cxx positioninit.cxx
subsystemFactory.cxx
screensaver_control.cxx screensaver_control.cxx
subsystemFactory.cxx
util.cxx
${RESOURCE_FILE} ${RESOURCE_FILE}
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx ${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx
) )
set(HEADERS set(HEADERS
AircraftDirVisitorBase.hxx
fg_commands.hxx fg_commands.hxx
fg_init.hxx fg_init.hxx
fg_io.hxx fg_io.hxx
@ -36,11 +37,10 @@ set(HEADERS
logger.hxx logger.hxx
main.hxx main.hxx
options.hxx options.hxx
util.hxx
positioninit.hxx positioninit.hxx
subsystemFactory.hxx
AircraftDirVisitorBase.hxx
screensaver_control.hxx screensaver_control.hxx
subsystemFactory.hxx
util.hxx
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.hxx ${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.hxx
) )
@ -96,7 +96,7 @@ add_executable(fgfs WIN32 MACOSX_BUNDLE
${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS}) ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# MacOSX bundle packagaing # MacOSX bundle packaging
if(APPLE) if(APPLE)
execute_process(COMMAND date +%Y execute_process(COMMAND date +%Y
@ -143,12 +143,15 @@ if(ENABLE_JSBSIM)
target_link_libraries(fgfs JSBSim) target_link_libraries(fgfs JSBSim)
endif() endif()
if(ENABLE_IAX) if(ENABLE_IAX)
target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY}) target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
endif() endif()
if(USE_DBUS) if(USE_DBUS)
target_link_libraries(fgfs ${DBUS_LIBRARIES}) target_link_libraries(fgfs ${DBUS_LIBRARIES})
endif() endif()
if(FG_HAVE_GPERFTOOLS) if(FG_HAVE_GPERFTOOLS)
include_directories(${GooglePerfTools_INCLUDE_DIR}) include_directories(${GooglePerfTools_INCLUDE_DIR})
target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES}) target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES})
@ -157,24 +160,26 @@ endif()
if(CRASHRPT_FOUND) if(CRASHRPT_FOUND)
target_link_libraries(fgfs ${CRASHRPT_LIBRARY}) target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
endif() endif()
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(fgfs ${X11_LIBRARIES}) target_link_libraries(fgfs ${X11_LIBRARIES})
endif() endif()
target_link_libraries(fgfs target_link_libraries(fgfs
SimGearCore SimGearScene SimGearCore
SimGearScene
${EVENT_INPUT_LIBRARIES}
${GDAL_LIBRARIES}
${HLA_LIBRARIES}
${OPENGL_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES}
${PLATFORM_LIBS}
${PLIB_LIBRARIES}
${SQLITE3_LIBRARY} ${SQLITE3_LIBRARY}
${SIMGEAR_LIBRARIES} ${SIMGEAR_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES}
${PLIB_LIBRARIES}
${HLA_LIBRARIES}
${GDAL_LIBRARIES}
${EVENT_INPUT_LIBRARIES}
${PLATFORM_LIBS}
) )
if(ENABLE_FLITE) if(ENABLE_FLITE)
if(SYSTEM_HTS_ENGINE) if(SYSTEM_HTS_ENGINE)
target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES}) target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES})