diff --git a/.gitmodules b/.gitmodules index c98ca2804..cc479aeae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 [submodule "externals"] - path = externals + path = third_party/externals url = git@github.com:swift-project/externals.git [submodule "src/xswiftbus/xplanemp2"] path = src/xswiftbus/xplanemp2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 97a93ad7b..e080985ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,11 +185,11 @@ if(WIN32) endif() add_custom_command(TARGET copy_externals_to_build_dir POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different externals/win32-msvc/${ARCH_DIR}/bin ${PROJECT_BINARY_DIR}/out/bin + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different third_party/externals/win32-msvc/${ARCH_DIR}/bin ${PROJECT_BINARY_DIR}/out/bin WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) add_custom_command(TARGET copy_externals_to_build_dir POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different externals/win32-msvc/${ARCH_DIR}/lib ${PROJECT_BINARY_DIR}/out/bin + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different third_party/externals/win32-msvc/${ARCH_DIR}/lib ${PROJECT_BINARY_DIR}/out/bin WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endif() diff --git a/cmake/crashpad/CMakeLists.txt b/cmake/crashpad/CMakeLists.txt index 2245188c6..f19c4776e 100644 --- a/cmake/crashpad/CMakeLists.txt +++ b/cmake/crashpad/CMakeLists.txt @@ -3,48 +3,48 @@ add_library(externals_crashpad INTERFACE) target_include_directories(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/common/include/crashpad - ${PROJECT_SOURCE_DIR}/externals/common/include/crashpad/mini_chromium + ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad + ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/crashpad/mini_chromium ) if(SWIFT_WIN32) if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/based.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/clientd.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/utild.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/based.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/clientd.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/utild.lib ) else() target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/base.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/client.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/util.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/base.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/client.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/util.lib ) endif() elseif(SWIFT_WIN64) if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/based.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/clientd.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/utild.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/based.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/clientd.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/utild.lib ) else() target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/base.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/client.lib - ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/util.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/base.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/client.lib + ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/util.lib ) endif() elseif(APPLE) target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libbase.a - ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libclient.a - ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libutil.a + ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libbase.a + ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libclient.a + ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libutil.a ) else() target_link_libraries(externals_crashpad INTERFACE - ${PROJECT_SOURCE_DIR}/externals/linux-g++/64/lib/libbase.a - ${PROJECT_SOURCE_DIR}/externals/linux-g++/64/lib/libclient.a - ${PROJECT_SOURCE_DIR}/externals/linux-g++/64/lib/libutil.a + ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libbase.a + ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libclient.a + ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libutil.a ) endif() diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index d92474e0e..48cb3d02e 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -10,30 +10,30 @@ if(UNIX AND NOT APPLE) target_include_directories(externals_dbus INTERFACE ${DBUS_INCLUDE_DIRS}) set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${DBUS_LINK_LIBRARIES}) elseif(SWIFT_WIN32) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/include) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/include) - set_target_properties(externals_dbus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/dbus-1.lib) - set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/dbus-1-3.dll) + set_target_properties(externals_dbus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/dbus-1.lib) + set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/dbus-1-3.dll) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION xswiftbus/64) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION bin) - install(FILES ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/bin/dbus-daemon.exe DESTINATION bin) + install(FILES ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/bin/dbus-daemon.exe DESTINATION bin) elseif(SWIFT_WIN64) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/include) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/include) - set_target_properties(externals_dbus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/dbus-1.lib) - set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/dbus-1-3.dll) + set_target_properties(externals_dbus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/dbus-1.lib) + set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/dbus-1-3.dll) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION xswiftbus/64) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION bin) - install(FILES ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION bin) + install(FILES ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION bin) elseif(APPLE) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) - target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/include/) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) + target_include_directories(externals_dbus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/include/) - set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libdbus-1.3.dylib) + set_target_properties(externals_dbus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libdbus-1.3.dylib) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION xswiftbus/64 PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) install(IMPORTED_RUNTIME_ARTIFACTS externals_dbus DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - install(FILES ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/bin/dbus-daemon DESTINATION bin) - install(FILES ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/bin/dbus-uuidgen DESTINATION bin) + install(FILES ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/bin/dbus-daemon DESTINATION bin) + install(FILES ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/bin/dbus-uuidgen DESTINATION bin) endif() diff --git a/cmake/dplay/CMakeLists.txt b/cmake/dplay/CMakeLists.txt index 8ffd64cdb..4bb64acf1 100644 --- a/cmake/dplay/CMakeLists.txt +++ b/cmake/dplay/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 if(SWIFT_BUILD_FS9_PLUGIN) - set(DPLAY_PATH ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/include) + set(DPLAY_PATH ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/include) if(NOT EXISTS "${DPLAY_PATH}/dplay8.h") message(WARNING "DPLAY_PATH does not point to dplay include directory. FS9 support disabled.") set(SWIFT_BUILD_FS9_PLUGIN OFF PARENT_SCOPE) diff --git a/cmake/event/CMakeLists.txt b/cmake/event/CMakeLists.txt index b3b141c3b..e2e1349c8 100644 --- a/cmake/event/CMakeLists.txt +++ b/cmake/event/CMakeLists.txt @@ -3,16 +3,16 @@ add_library(externals_event SHARED IMPORTED GLOBAL) -target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) +target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) if(SWIFT_WIN64) - target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/include) + target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/include) - set_target_properties(externals_event PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/event_core.lib) - set_target_properties(externals_event PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/event_core.dll) + set_target_properties(externals_event PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/event_core.lib) + set_target_properties(externals_event PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/event_core.dll) elseif(APPLE) - target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/include) - set_target_properties(externals_event PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libevent_core.2.1.8.dylib) + target_include_directories(externals_event INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/include) + set_target_properties(externals_event PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libevent_core.2.1.8.dylib) else() find_package(PkgConfig REQUIRED) pkg_search_module(libevent_core REQUIRED libevent_core) diff --git a/cmake/install.cmake b/cmake/install.cmake index 5906ef541..0b2057f64 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -10,28 +10,28 @@ install(FILES ${GENERAL_FILES} DESTINATION bin) # 7za if(SWIFT_WIN32) - install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/32/bin/7za.exe DESTINATION bin) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/bin/7za.exe DESTINATION bin) elseif(SWIFT_WIN64) - install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/64/bin/7za.exe DESTINATION bin) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/bin/7za.exe DESTINATION bin) elseif(APPLE) - install(FILES ${swift_SOURCE_DIR}/externals/macx-clang/64/bin/7za DESTINATION bin) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/macx-clang/64/bin/7za DESTINATION bin) endif() # Crashpad if(UNIX AND NOT APPLE) - set(crashpad_handler_path ${swift_SOURCE_DIR}/externals/linux-g++/64/bin/swift_crashpad_handler) + set(crashpad_handler_path ${swift_SOURCE_DIR}/third_party/externals/linux-g++/64/bin/swift_crashpad_handler) elseif(SWIFT_WIN32) - set(crashpad_handler_path ${swift_SOURCE_DIR}/externals/win32-msvc/32/bin/swift_crashpad_handler.exe) + set(crashpad_handler_path ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/bin/swift_crashpad_handler.exe) elseif(SWIFT_WIN64) - set(crashpad_handler_path ${swift_SOURCE_DIR}/externals/win32-msvc/64/bin/swift_crashpad_handler.exe) + set(crashpad_handler_path ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/bin/swift_crashpad_handler.exe) elseif(APPLE) - set(crashpad_handler_path ${swift_SOURCE_DIR}/externals/macx-clang/64/bin/swift_crashpad_handler) + set(crashpad_handler_path ${swift_SOURCE_DIR}/third_party/externals/macx-clang/64/bin/swift_crashpad_handler) endif() install(PROGRAMS ${crashpad_handler_path} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) # create_dbus_machineid if(APPLE) - install(FILES ${swift_SOURCE_DIR}/externals/macx-clang/64/bin/create_dbus_machineid.scpt DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/macx-clang/64/bin/create_dbus_machineid.scpt DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) endif() # Deploy qt libs diff --git a/cmake/msgpack/CMakeLists.txt b/cmake/msgpack/CMakeLists.txt index 95d6544d1..85a168783 100644 --- a/cmake/msgpack/CMakeLists.txt +++ b/cmake/msgpack/CMakeLists.txt @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 add_library(externals_msgpack INTERFACE) -target_include_directories(externals_msgpack INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) +target_include_directories(externals_msgpack INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) diff --git a/cmake/opus/CMakeLists.txt b/cmake/opus/CMakeLists.txt index 20e7b1e0c..d1aabde98 100644 --- a/cmake/opus/CMakeLists.txt +++ b/cmake/opus/CMakeLists.txt @@ -9,19 +9,19 @@ if(UNIX AND NOT APPLE) pkg_search_module(OPUS REQUIRED opus) set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${OPUS_LINK_LIBRARIES}) else() - target_include_directories(externals_opus INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) + target_include_directories(externals_opus INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) endif() if(APPLE) - set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libopus.0.dylib) + set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libopus.0.dylib) endif() if(SWIFT_WIN32) - set_target_properties(externals_opus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/opus.lib) - set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/opus.dll) + set_target_properties(externals_opus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/opus.lib) + set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/opus.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_opus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/opus.lib) - set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/opus.dll) + set_target_properties(externals_opus PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/opus.lib) + set_target_properties(externals_opus PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/opus.dll) endif() if(WIN32 OR APPLE) diff --git a/cmake/qwt_plot/CMakeLists.txt b/cmake/qwt_plot/CMakeLists.txt index b8ee562d1..c2de5e96d 100644 --- a/cmake/qwt_plot/CMakeLists.txt +++ b/cmake/qwt_plot/CMakeLists.txt @@ -3,25 +3,25 @@ add_library(externals_qwt_plot SHARED IMPORTED GLOBAL) -target_include_directories(externals_qwt_plot INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include/qwt) +target_include_directories(externals_qwt_plot INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/qwt) if(UNIX AND NOT APPLE) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/linux-g++/64/lib/libqwt.so) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libqwt.so) elseif(APPLE) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/qwt.framework/qwt) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/qwt.framework/qwt) elseif(SWIFT_WIN32) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/qwt.lib) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/qwt.dll) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/qwt.lib) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/qwt.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/qwt.lib) - set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/qwt.dll) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/qwt.lib) + set_target_properties(externals_qwt_plot PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/qwt.dll) endif() target_link_libraries(externals_qwt_plot INTERFACE Qt::OpenGL) if(APPLE) # Special handling for qwt.framework - install(DIRECTORY ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/qwt.framework DESTINATION lib) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/qwt.framework DESTINATION lib) else() install(IMPORTED_RUNTIME_ARTIFACTS externals_qwt_plot LIBRARY DESTINATION lib diff --git a/cmake/rapidjson/CMakeLists.txt b/cmake/rapidjson/CMakeLists.txt index 228606da1..e34f8d85d 100644 --- a/cmake/rapidjson/CMakeLists.txt +++ b/cmake/rapidjson/CMakeLists.txt @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 add_library(externals_rapidjson INTERFACE) -target_include_directories(externals_rapidjson SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) +target_include_directories(externals_rapidjson SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) diff --git a/cmake/simconnect/CMakeLists.txt b/cmake/simconnect/CMakeLists.txt index 1f96b245e..8c2dddabe 100644 --- a/cmake/simconnect/CMakeLists.txt +++ b/cmake/simconnect/CMakeLists.txt @@ -9,10 +9,10 @@ if(SWIFT_BUILD_FSX_PLUGIN OR SWIFT_BUILD_P3D_PLUGIN OR SWIFT_BUILD_MSFS_PLUGIN) target_compile_definitions(externals_simconnect INTERFACE SIMCONNECT_H_NOMANIFEST) target_compile_definitions(externals_simconnect INTERFACE BUID_SIMCONNECT_LIB) if(SWIFT_WIN64) - target_include_directories(externals_simconnect INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include/simconnect/P3D-v4) + target_include_directories(externals_simconnect INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/simconnect/P3D-v4) target_compile_definitions(externals_simconnect INTERFACE P3D_SDK_VERSION=400) elseif(SWIFT_WIN32) - target_include_directories(externals_simconnect INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include/simconnect/FSX-XPack) + target_include_directories(externals_simconnect INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/simconnect/FSX-XPack) endif() add_custom_target(external_simconnects_dlls) @@ -27,7 +27,7 @@ if(SWIFT_BUILD_FSX_PLUGIN OR SWIFT_BUILD_P3D_PLUGIN OR SWIFT_BUILD_MSFS_PLUGIN) endmacro() if(SWIFT_WIN32) - add_install_command(${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/SimConnect.dll) + add_install_command(${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/SimConnect.dll) elseif(SWIFT_WIN64) list(APPEND LIBS SimConnect.MSFS.dll) list(APPEND LIBS SimConnect.P3D-v4.0.dll) @@ -38,7 +38,7 @@ if(SWIFT_BUILD_FSX_PLUGIN OR SWIFT_BUILD_P3D_PLUGIN OR SWIFT_BUILD_MSFS_PLUGIN) list(APPEND LIBS SimConnect.P3D-v4.5.dll) foreach (LIB IN LISTS LIBS) - add_install_command( ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/${LIB}) + add_install_command( ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/${LIB}) endforeach() endif() endif() diff --git a/cmake/sodium/CMakeLists.txt b/cmake/sodium/CMakeLists.txt index c092fe58e..6e2e04088 100644 --- a/cmake/sodium/CMakeLists.txt +++ b/cmake/sodium/CMakeLists.txt @@ -15,17 +15,17 @@ if(UNIX AND NOT APPLE) set(SOMAJOR_VERSION_ABS "${dir}/${SOMAJOR_VERSION}") set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${SOMAJOR_VERSION_ABS}) else() - target_include_directories(externals_sodium INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) + target_include_directories(externals_sodium INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) endif() if(APPLE) - set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libsodium.23.dylib) + set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libsodium.23.dylib) elseif(SWIFT_WIN32) - set_target_properties(externals_sodium PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/sodium.lib) - set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/libsodium.dll) + set_target_properties(externals_sodium PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/sodium.lib) + set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/libsodium.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_sodium PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/sodium.lib) - set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/libsodium.dll) + set_target_properties(externals_sodium PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/sodium.lib) + set_target_properties(externals_sodium PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/libsodium.dll) endif() install(IMPORTED_RUNTIME_ARTIFACTS externals_sodium diff --git a/cmake/tls/CMakeLists.txt b/cmake/tls/CMakeLists.txt index b4788608a..c6cbe258b 100644 --- a/cmake/tls/CMakeLists.txt +++ b/cmake/tls/CMakeLists.txt @@ -4,17 +4,17 @@ if(WIN32) add_library(externals_ssl SHARED IMPORTED GLOBAL) if(SWIFT_WIN32) - set_target_properties(externals_ssl PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/libssl-1_1.dll) + set_target_properties(externals_ssl PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/libssl-1_1.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_ssl PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/libssl-1_1-x64.dll) + set_target_properties(externals_ssl PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/libssl-1_1-x64.dll) endif() install(IMPORTED_RUNTIME_ARTIFACTS externals_ssl) add_library(externals_crypto SHARED IMPORTED GLOBAL) if(SWIFT_WIN32) - set_target_properties(externals_crypto PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/libcrypto-1_1.dll) + set_target_properties(externals_crypto PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/libcrypto-1_1.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_crypto PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/libcrypto-1_1-x64.dll) + set_target_properties(externals_crypto PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/libcrypto-1_1-x64.dll) endif() install(IMPORTED_RUNTIME_ARTIFACTS externals_crypto) diff --git a/cmake/vatsimauth/CMakeLists.txt b/cmake/vatsimauth/CMakeLists.txt index 1d2bccc50..761e120f1 100644 --- a/cmake/vatsimauth/CMakeLists.txt +++ b/cmake/vatsimauth/CMakeLists.txt @@ -3,18 +3,18 @@ add_library(externals_vatsim_auth SHARED IMPORTED GLOBAL) -target_include_directories(externals_vatsim_auth INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include/) +target_include_directories(externals_vatsim_auth INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/) if(UNIX AND NOT APPLE) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/linux-g++/64/lib/libvatsimauth.so) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/linux-g++/64/lib/libvatsimauth.so) elseif(APPLE) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/libvatsimauth.dylib) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/libvatsimauth.dylib) elseif(SWIFT_WIN32) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/vatsimauth.lib) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/32/lib/vatsimauth.dll) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/vatsimauth.lib) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/vatsimauth.dll) elseif(SWIFT_WIN64) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/vatsimauth.lib) - set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/vatsimauth.dll) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/vatsimauth.lib) + set_target_properties(externals_vatsim_auth PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/vatsimauth.dll) endif() if(UNIX AND NOT APPLE) diff --git a/cmake/xp/CMakeLists.txt b/cmake/xp/CMakeLists.txt index 675eaed4c..7c2d03ce9 100644 --- a/cmake/xp/CMakeLists.txt +++ b/cmake/xp/CMakeLists.txt @@ -8,21 +8,21 @@ elseif(UNIX) endif() -target_include_directories(externals_xplm INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include ${PROJECT_SOURCE_DIR}/externals/common/include/XPLM) +target_include_directories(externals_xplm INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include ${PROJECT_SOURCE_DIR}/third_party/externals/common/include/XPLM) if(SWIFT_WIN64) - set_target_properties(externals_xplm PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/XPLM_64.lib) + set_target_properties(externals_xplm PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/XPLM_64.lib) elseif(APPLE) - set_target_properties(externals_xplm PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/XPLM.framework/XPLM) + set_target_properties(externals_xplm PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/XPLM.framework/XPLM) endif() if(SWIFT_WIN64 OR APPLE) add_library(externals_xpwidgets STATIC IMPORTED GLOBAL) - target_include_directories(externals_xpwidgets INTERFACE ${PROJECT_SOURCE_DIR}/externals/common/include) + target_include_directories(externals_xpwidgets INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include) if(SWIFT_WIN64) - set_target_properties(externals_xpwidgets PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/win32-msvc/64/lib/XPWidgets_64.lib) + set_target_properties(externals_xpwidgets PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/XPWidgets_64.lib) elseif(APPLE) - set_target_properties(externals_xpwidgets PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/externals/macx-clang/64/lib/XPWidgets.framework/XPWidgets) + set_target_properties(externals_xpwidgets PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/third_party/externals/macx-clang/64/lib/XPWidgets.framework/XPWidgets) endif() endif() diff --git a/scripts/build.py b/scripts/build.py index 594271cf4..ae0faa0a8 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -241,7 +241,7 @@ class Builder: self.__build_path = path.abspath(path.join(self.__source_path, 'build')) files = os.listdir(self.__source_path) - for dir in ['src', 'installer', 'externals']: + for dir in ['src', 'installer', 'third_party']: if dir not in files: raise RuntimeError('Cannot find {} folder! Are we in the right directory?'.format(dir)) diff --git a/src/xswiftbus/CMakeLists.txt b/src/xswiftbus/CMakeLists.txt index 806e4b2f9..50e45d39c 100644 --- a/src/xswiftbus/CMakeLists.txt +++ b/src/xswiftbus/CMakeLists.txt @@ -111,11 +111,11 @@ target_link_libraries(xswiftbus PUBLIC externals_event externals_dbus externals_ if(SWIFT_WIN32) - set(PNG_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/32/lib/png.lib) - set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/32/lib/z.lib) + set(PNG_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/png.lib) + set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/32/lib/z.lib) elseif(SWIFT_WIN64) - set(PNG_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/png.lib) - set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/z.lib) + set(PNG_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/png.lib) + set(ZLIB_LIBRARIES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/z.lib) else() find_package(PNG REQUIRED) @@ -190,8 +190,8 @@ if(WIN32) configure_file(${swift_SOURCE_DIR}/src/blackmisc/share/dbus-1/session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/session.conf) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION xswiftbus/64/share/dbus-1/) - install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION xswiftbus/64/) - install(FILES ${swift_SOURCE_DIR}/externals/win32-msvc/64/lib/expat.dll DESTINATION xswiftbus/64/) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/bin/dbus-daemon.exe DESTINATION xswiftbus/64/) + install(FILES ${swift_SOURCE_DIR}/third_party/externals/win32-msvc/64/lib/expat.dll DESTINATION xswiftbus/64/) endif() install(DIRECTORY LegacyData DESTINATION xswiftbus) diff --git a/third_party/README.md b/third_party/README.md new file mode 100644 index 000000000..edb1359a7 --- /dev/null +++ b/third_party/README.md @@ -0,0 +1,7 @@ + + +This folder contains third-party dependencies for swift. +The ``externals`` submodule mainly holds prebuilt libraries required by swift. diff --git a/externals b/third_party/externals similarity index 100% rename from externals rename to third_party/externals