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
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/Main/CMakeLists.txt
View file

@ -1,15 +1,15 @@
if (MSVC)
set( RESOURCE_FILE flightgear.rc )
endif (MSVC)
if(MSVC)
set(RESOURCE_FILE flightgear.rc)
endif(MSVC)
set(SOURCES
bootstrap.cxx
fg_commands.cxx
fg_scene_commands.cxx
fg_init.cxx
fg_io.cxx
fg_os_common.cxx
fg_scene_commands.cxx
fg_props.cxx
FGInterpolator.cxx
globals.cxx
@ -17,15 +17,16 @@ set(SOURCES
logger.cxx
main.cxx
options.cxx
util.cxx
positioninit.cxx
subsystemFactory.cxx
screensaver_control.cxx
subsystemFactory.cxx
util.cxx
${RESOURCE_FILE}
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx
)
)
set(HEADERS
AircraftDirVisitorBase.hxx
fg_commands.hxx
fg_init.hxx
fg_io.hxx
@ -36,23 +37,22 @@ set(HEADERS
logger.hxx
main.hxx
options.hxx
util.hxx
positioninit.hxx
subsystemFactory.hxx
AircraftDirVisitorBase.hxx
screensaver_control.hxx
subsystemFactory.hxx
util.hxx
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.hxx
)
)
# On Windows, make sure fgrcc can be run (it needs third-party libraries)
if (MSVC)
if (MSVC_3RDPARTY_ROOT AND MSVC_3RDPARTY_DIR)
if(MSVC)
if(MSVC_3RDPARTY_ROOT AND MSVC_3RDPARTY_DIR)
set(CMAKE_MSVCIDE_RUN_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/bin)
else ()
else()
message(FATAL_ERROR
"Either MSVC_3RDPARTY_ROOT or MSVC_3RDPARTY_DIR is empty or unset")
endif ()
endif ()
endif()
endif()
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx
@ -60,7 +60,7 @@ add_custom_command(
COMMAND fgrcc --root=${CMAKE_SOURCE_DIR} --output-cpp-file=${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx --init-func-name=initFlightGearEmbeddedResources --output-header-file=${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.hxx --output-header-identifier=_FG_FLIGHTGEAR_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/src/EmbeddedResources/FlightGear-resources.xml
DEPENDS
fgrcc ${CMAKE_SOURCE_DIR}/src/EmbeddedResources/FlightGear-resources.xml
)
)
get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS)
@ -96,7 +96,7 @@ add_executable(fgfs WIN32 MACOSX_BUNDLE
${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
#-----------------------------------------------------------------------------
# MacOSX bundle packagaing
# MacOSX bundle packaging
if(APPLE)
execute_process(COMMAND date +%Y
@ -143,38 +143,43 @@ if(ENABLE_JSBSIM)
target_link_libraries(fgfs JSBSim)
endif()
if(ENABLE_IAX)
target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
endif()
if(USE_DBUS)
target_link_libraries(fgfs ${DBUS_LIBRARIES})
endif()
if(FG_HAVE_GPERFTOOLS)
include_directories(${GooglePerfTools_INCLUDE_DIR})
target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES})
endif()
if (CRASHRPT_FOUND)
if(CRASHRPT_FOUND)
target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
endif()
if(X11_FOUND)
target_link_libraries(fgfs ${X11_LIBRARIES})
endif()
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}
${SIMGEAR_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES}
${PLIB_LIBRARIES}
${HLA_LIBRARIES}
${GDAL_LIBRARIES}
${EVENT_INPUT_LIBRARIES}
${PLATFORM_LIBS}
)
if(ENABLE_FLITE)
if(SYSTEM_HTS_ENGINE)
target_link_libraries(fgfs flite_hts ${HTS_ENGINE_LIBRARIES})
@ -183,12 +188,12 @@ if(ENABLE_FLITE)
endif()
endif()
if (Qt5Core_FOUND)
if(Qt5Core_FOUND)
target_link_libraries(fgfs Qt5::Core Qt5::Widgets fglauncher fgqmlui)
set_property(TARGET fgfs PROPERTY AUTOMOC ON)
endif()
if (USE_AEONWAVE)
if(USE_AEONWAVE)
target_link_libraries(fgfs ${AAX_LIBRARY})
endif()