From c02345fd7148483550d117d518ad8b1ff34d1f40 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 18 Jun 2021 11:57:37 -0700 Subject: [PATCH] LYN-4657 OSX: Building AutomatedTesting project fails (#1436) * LYN-4657 OSX: Building AutomatedTesting project fails * forgot this file --- .../Tests/Serialization/Json/JsonSerializerConformityTests.h | 2 +- cmake/Platform/Common/Clang/Configurations_clang.cmake | 2 ++ cmake/Platform/Linux/Configurations_linux.cmake | 2 -- cmake/Platform/Mac/Configurations_mac.cmake | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h index 4931c203cf..9d7e58dd36 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h +++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h @@ -1206,7 +1206,7 @@ namespace JsonSerializationTests if (this->m_features.m_enableInitializationTest) { auto instance = this->m_description.CreateDefaultInstance(); - typename TypeParam::Type compare; + typename TypeParam::Type compare = typename TypeParam::Type{}; if (!this->m_description.AreEqual(*instance, compare)) { auto serializer = this->m_description.CreateSerializer(); diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake index 768b7dd4c2..3e01d5ab2d 100644 --- a/cmake/Platform/Common/Clang/Configurations_clang.cmake +++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake @@ -55,6 +55,8 @@ ly_append_configurations_options( -g # debug symbols COMPILATION_RELEASE -O2 + LINK_NON_STATIC + -Wl,-undefined,error ) include(cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake) diff --git a/cmake/Platform/Linux/Configurations_linux.cmake b/cmake/Platform/Linux/Configurations_linux.cmake index cca363590e..d3e639e714 100644 --- a/cmake/Platform/Linux/Configurations_linux.cmake +++ b/cmake/Platform/Linux/Configurations_linux.cmake @@ -21,8 +21,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") COMPILATION -fPIC -msse4.1 - LINK_NON_STATIC - -Wl,--no-undefined ) ly_set(CMAKE_CXX_EXTENSIONS OFF) else() diff --git a/cmake/Platform/Mac/Configurations_mac.cmake b/cmake/Platform/Mac/Configurations_mac.cmake index 007c13cd6d..85b0b7e92e 100644 --- a/cmake/Platform/Mac/Configurations_mac.cmake +++ b/cmake/Platform/Mac/Configurations_mac.cmake @@ -20,7 +20,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") __APPLE__ DARWIN LINK_NON_STATIC - -Wl,-undefined,error -headerpad_max_install_names -lpthread -lncurses