Skip to content

Commit 0fe84aa

Browse files
committed
fix(build): salvage Ubuntu/UE compile hygiene (credit @zimmy87 #4561)
Export UnrealImageCapture, drop Linux packaging stdc++ force-links, and stop adding standalone c++fs/stdc++fs once filesystem lives in the stdlib.
1 parent d109f0d commit 0fe84aa

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

Unreal/Plugins/AirSim/Source/AirSim.Build.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ private void AddOSLibDependencies(ReadOnlyTargetRules Target)
105105
PublicAdditionalLibraries.Add("dxguid.lib");
106106
}
107107

108-
if (Target.Platform == UnrealTargetPlatform.Linux)
109-
{
110-
// needed when packaging
111-
PublicAdditionalLibraries.Add("stdc++");
112-
PublicAdditionalLibraries.Add("supc++");
113-
}
114108
}
115109

116110
static void CopyFileIfNewer(string srcFilePath, string destFolder)

Unreal/Plugins/AirSim/Source/UnrealImageCapture.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "common/ImageCaptureBase.hpp"
66
#include "common/common_utils/UniqueValueMap.hpp"
77

8-
class UnrealImageCapture : public msr::airlib::ImageCaptureBase
8+
class AIRSIM_API UnrealImageCapture : public msr::airlib::ImageCaptureBase
99
{
1010
public:
1111
typedef msr::airlib::ImageCaptureBase::ImageType ImageType;

cmake/cmake-modules/CommonSetup.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ macro(CommonSetup)
5959
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
6060
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
6161
find_package(LLVM REQUIRED CONFIG)
62-
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
62+
# c++17 filesystem is in the standard library; do not force c++fs/stdc++fs.
63+
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
6364
else()
64-
set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
65+
set(CXX_EXP_LIB "-fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
6566
endif ()
6667
endif ()
6768

0 commit comments

Comments
 (0)