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

151
src/Main/CMakeLists.txt
View file

@ -1,58 +1,58 @@
if (MSVC) if(MSVC)
set( RESOURCE_FILE flightgear.rc ) set(RESOURCE_FILE flightgear.rc)
endif (MSVC) 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
locale.cxx locale.cxx
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
${RESOURCE_FILE} subsystemFactory.cxx
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx util.cxx
) ${RESOURCE_FILE}
${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx
)
set(HEADERS set(HEADERS
fg_commands.hxx
fg_init.hxx
fg_io.hxx
fg_props.hxx
FGInterpolator.hxx
globals.hxx
locale.hxx
logger.hxx
main.hxx
options.hxx
util.hxx
positioninit.hxx
subsystemFactory.hxx
AircraftDirVisitorBase.hxx AircraftDirVisitorBase.hxx
fg_commands.hxx
fg_init.hxx
fg_io.hxx
fg_props.hxx
FGInterpolator.hxx
globals.hxx
locale.hxx
logger.hxx
main.hxx
options.hxx
positioninit.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
) )
# On Windows, make sure fgrcc can be run (it needs third-party libraries) # On Windows, make sure fgrcc can be run (it needs third-party libraries)
if (MSVC) if(MSVC)
if (MSVC_3RDPARTY_ROOT AND MSVC_3RDPARTY_DIR) if(MSVC_3RDPARTY_ROOT AND MSVC_3RDPARTY_DIR)
set(CMAKE_MSVCIDE_RUN_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/bin) set(CMAKE_MSVCIDE_RUN_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/bin)
else () else()
message(FATAL_ERROR message(FATAL_ERROR
"Either MSVC_3RDPARTY_ROOT or MSVC_3RDPARTY_DIR is empty or unset") "Either MSVC_3RDPARTY_ROOT or MSVC_3RDPARTY_DIR is empty or unset")
endif () endif()
endif () endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.cxx 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 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 DEPENDS
fgrcc ${CMAKE_SOURCE_DIR}/src/EmbeddedResources/FlightGear-resources.xml fgrcc ${CMAKE_SOURCE_DIR}/src/EmbeddedResources/FlightGear-resources.xml
) )
get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES) get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS) get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS)
@ -70,19 +70,19 @@ link_directories ( ${Boost_LIBRARY_DIRS} )
get_property(FG_GROUPS_C GLOBAL PROPERTY FG_GROUPS_C) get_property(FG_GROUPS_C GLOBAL PROPERTY FG_GROUPS_C)
string(REPLACE "@" ";" groups ${FG_GROUPS_C} ) string(REPLACE "@" ";" groups ${FG_GROUPS_C} )
foreach(g ${groups}) foreach(g ${groups})
string(REPLACE "#" ";" g2 ${g}) string(REPLACE "#" ";" g2 ${g})
list(GET g2 0 name) list(GET g2 0 name)
list(REMOVE_AT g2 0) list(REMOVE_AT g2 0)
source_group("${name}\\Sources" FILES ${g2}) source_group("${name}\\Sources" FILES ${g2})
endforeach() endforeach()
get_property(FG_GROUPS_H GLOBAL PROPERTY FG_GROUPS_H) get_property(FG_GROUPS_H GLOBAL PROPERTY FG_GROUPS_H)
string(REPLACE "@" ";" groups ${FG_GROUPS_H} ) string(REPLACE "@" ";" groups ${FG_GROUPS_H} )
foreach(g ${groups}) foreach(g ${groups})
string(REPLACE "#" ";" g2 ${g}) string(REPLACE "#" ";" g2 ${g})
list(GET g2 0 name) list(GET g2 0 name)
list(REMOVE_AT g2 0) list(REMOVE_AT g2 0)
source_group("${name}\\Headers" FILES ${g2}) source_group("${name}\\Headers" FILES ${g2})
endforeach() endforeach()
source_group("Main\\Headers" FILES ${HEADERS}) source_group("Main\\Headers" FILES ${HEADERS})
@ -93,10 +93,10 @@ source_group("Main\\Sources" FILES ${SOURCES})
# it manually via AllocConsole() # it manually via AllocConsole()
# similarly pass MACOSX_BUNDLE so we generate a .app on Mac # similarly pass MACOSX_BUNDLE so we generate a .app on Mac
add_executable(fgfs WIN32 MACOSX_BUNDLE 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
@ -126,15 +126,15 @@ get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
#message(STATUS "SG libs ${SIMGEAR_LIBRARIES}") #message(STATUS "SG libs ${SIMGEAR_LIBRARIES}")
if(RTI_FOUND) if(RTI_FOUND)
set(HLA_LIBRARIES ${RTI_LIBRARIES}) set(HLA_LIBRARIES ${RTI_LIBRARIES})
else() else()
set(HLA_LIBRARIES "") set(HLA_LIBRARIES "")
endif() endif()
if(GDAL_FOUND) if(GDAL_FOUND)
set(GDAL_LIBRARIES ${GDAL_LIBRARY}) set(GDAL_LIBRARIES ${GDAL_LIBRARY})
else() else()
set(GDAL_LIBRARIES "") set(GDAL_LIBRARIES "")
endif() endif()
if(ENABLE_JSBSIM) if(ENABLE_JSBSIM)
@ -143,36 +143,41 @@ 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})
endif() 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
SimGearCore SimGearScene
${SQLITE3_LIBRARY}
${SIMGEAR_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES}
${OPENGL_LIBRARIES}
${PLIB_LIBRARIES}
${HLA_LIBRARIES}
${GDAL_LIBRARIES}
${EVENT_INPUT_LIBRARIES}
${PLATFORM_LIBS}
)
target_link_libraries(fgfs
SimGearCore
SimGearScene
${EVENT_INPUT_LIBRARIES}
${GDAL_LIBRARIES}
${HLA_LIBRARIES}
${OPENGL_LIBRARIES}
${OPENSCENEGRAPH_LIBRARIES}
${PLATFORM_LIBS}
${PLIB_LIBRARIES}
${SQLITE3_LIBRARY}
${SIMGEAR_LIBRARIES}
)
if(ENABLE_FLITE) if(ENABLE_FLITE)
@ -183,12 +188,12 @@ if(ENABLE_FLITE)
endif() endif()
endif() endif()
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
target_link_libraries(fgfs Qt5::Core Qt5::Widgets fglauncher fgqmlui) target_link_libraries(fgfs Qt5::Core Qt5::Widgets fglauncher fgqmlui)
set_property(TARGET fgfs PROPERTY AUTOMOC ON) set_property(TARGET fgfs PROPERTY AUTOMOC ON)
endif() endif()
if (USE_AEONWAVE) if(USE_AEONWAVE)
target_link_libraries(fgfs ${AAX_LIBRARY}) target_link_libraries(fgfs ${AAX_LIBRARY})
endif() endif()
@ -213,6 +218,6 @@ if(ENABLE_METAR)
endif() endif()
if (COMMAND flightgear_test) if (COMMAND flightgear_test)
flightgear_test(posinit test_posinit.cxx) flightgear_test(posinit test_posinit.cxx)
flightgear_test(autosaveMigration test_autosaveMigration.cxx) flightgear_test(autosaveMigration test_autosaveMigration.cxx)
endif() endif()