Merge pull request OpenEnroth#1343 from captainurist/macos_fixes_400

MacOS build fixes
captainurist · Oct 15, 2023 · b1dd43f · b1dd43f
2 parents 059e893 + a60abc1
commit b1dd43f
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
 include(Git)
 include(Detection)
-include(AppleLibcxxAssertions)
 include(ExternalProject)
 include(CppLint)
 include(Dependencies)
@@ -120,7 +119,7 @@ elseif(BUILD_COMPILER STREQUAL "clang")
     add_compile_options(-Werror=inconsistent-missing-override) # 'override' only used on some of the overridden functions.
     add_compile_options(-Werror=invalid-noreturn) # function declared 'noreturn' should not return.
     add_compile_options(-Werror=uninitialized) # variable 'x' is used uninitialized.
-    enable_libcxx_assertions(FALSE)
+    add_compile_definitions($<$<CONFIG:Debug>:_LIBCPP_ENABLE_ASSERTIONS=1>) # Enable assertions in libcxx.
 elseif(BUILD_COMPILER STREQUAL "msvc")
     # /Zi -> /Z7: Pack debug info into .obj files, this is needed for ccache to work. Note that pdb for the binary
     #             itself is still generated.

diff --git a/CMakeModules/AppleLibcxxAssertionTest.cpp b/CMakeModules/AppleLibcxxAssertionTest.cpp
diff --git a/CMakeModules/AppleLibcxxAssertionWorkaround.cpp b/CMakeModules/AppleLibcxxAssertionWorkaround.cpp
diff --git a/CMakeModules/AppleLibcxxAssertions.cmake b/CMakeModules/AppleLibcxxAssertions.cmake
diff --git a/src/Bin/CodeGen/CMakeLists.txt b/src/Bin/CodeGen/CMakeLists.txt
@@ -13,7 +13,6 @@ set(BIN_CODEGEN_HEADERS
 
 if(NOT BUILD_PLATFORM STREQUAL "android")
     add_executable(CodeGen ${BIN_CODEGEN_SOURCES} ${BIN_CODEGEN_HEADERS})
-    target_fix_libcxx_assertions(CodeGen)
     target_link_libraries(CodeGen PUBLIC platform_main application CLI11::CLI11)
     target_check_style(CodeGen)
 endif()
diff --git a/src/Bin/LodTool/CMakeLists.txt b/src/Bin/LodTool/CMakeLists.txt
@@ -9,7 +9,6 @@ set(BIN_LODTOOL_HEADERS
 
 if(NOT BUILD_PLATFORM STREQUAL "android")
     add_executable(LodTool ${BIN_LODTOOL_SOURCES} ${BIN_LODTOOL_HEADERS})
-    target_fix_libcxx_assertions(LodTool)
     target_link_libraries(LodTool PUBLIC library_lod library_lodformats CLI11::CLI11)
     target_check_style(LodTool)
 endif()
diff --git a/src/Bin/OpenEnroth/CMakeLists.txt b/src/Bin/OpenEnroth/CMakeLists.txt
@@ -17,7 +17,6 @@ else()
     add_executable(OpenEnroth MACOSX_BUNDLE)
     target_sources(OpenEnroth PUBLIC ${BIN_OPENENROTH_HEADERS} ${BIN_OPENENROTH_SOURCES})
     target_check_style(OpenEnroth)
-    target_fix_libcxx_assertions(OpenEnroth)
     target_link_libraries(OpenEnroth PUBLIC platform_main application CLI11::CLI11)
 
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OpenEnroth)

diff --git a/src/Media/CMakeLists.txt b/src/Media/CMakeLists.txt
@@ -11,7 +11,7 @@ set(MEDIA_HEADERS
         MediaPlayer.h)
 
 add_library(media STATIC ${MEDIA_SOURCES} ${MEDIA_HEADERS})
-target_link_libraries(media PUBLIC media_audio utility application)
+target_link_libraries(media PUBLIC media_audio library_logger utility application)
 target_link_libraries(media PRIVATE ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWSCALE_LIBRARIES} ${SWRESAMPLE_LIBRARIES})
 target_compile_definitions(media PRIVATE FF_API_NEXT)
 target_include_directories(media PRIVATE ${FFMPEG_INCLUDE_DIRS})

diff --git a/test/Bin/GameTest/CMakeLists.txt b/test/Bin/GameTest/CMakeLists.txt
@@ -9,7 +9,6 @@ if(OE_BUILD_TESTS)
             GameTestOptions.h)
 
     add_executable(OpenEnroth_GameTest ${GAME_TEST_MAIN_SOURCES} ${GAME_TEST_MAIN_HEADERS})
-    target_fix_libcxx_assertions(OpenEnroth_GameTest)
     target_link_libraries(OpenEnroth_GameTest PUBLIC platform_main application testing_game GTest::gtest CLI11::CLI11)
 
     target_check_style(OpenEnroth_GameTest)

diff --git a/test/Bin/UnitTest/CMakeLists.txt b/test/Bin/UnitTest/CMakeLists.txt
@@ -5,7 +5,6 @@ if(OE_BUILD_TESTS)
             UnitTestMain.cpp)
 
     add_executable(OpenEnroth_UnitTest ${UNIT_TEST_MAIN_SOURCES})
-    target_fix_libcxx_assertions(OpenEnroth_UnitTest)
     target_link_libraries(OpenEnroth_UnitTest PUBLIC testing_unit CLI11::CLI11)
 
     add_custom_target(UnitTest OpenEnroth_UnitTest