Updated ozz-animation to version 0.14.1 @35b2efd4
This commit is contained in:
+1
-2
@@ -1,4 +1,4 @@
|
||||
add_library(gtest
|
||||
add_library(gtest STATIC
|
||||
fused-src/gtest/gtest_main.cc
|
||||
fused-src/gtest/gtest-all.cc
|
||||
fused-src/gtest/gtest.h)
|
||||
@@ -12,4 +12,3 @@ target_link_libraries(gtest
|
||||
|
||||
target_include_directories(gtest PUBLIC
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/gtest/fused-src>)
|
||||
|
||||
|
||||
@@ -7832,14 +7832,14 @@ static int ExecDeathTestChildMain(void* child_arg) {
|
||||
// correct answer.
|
||||
void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_;
|
||||
void StackLowerThanAddress(const void* ptr, bool* result) {
|
||||
int dummy;
|
||||
int dummy = 0;
|
||||
*result = (&dummy < ptr);
|
||||
}
|
||||
|
||||
// Make sure AddressSanitizer does not tamper with the stack here.
|
||||
GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
|
||||
bool StackGrowsDown() {
|
||||
int dummy;
|
||||
int dummy = 0;
|
||||
bool result;
|
||||
StackLowerThanAddress(&dummy, &result);
|
||||
return result;
|
||||
|
||||
@@ -6,8 +6,18 @@ add_library(json
|
||||
set_target_properties(json
|
||||
PROPERTIES FOLDER "extern")
|
||||
|
||||
target_compile_definitions(json
|
||||
PUBLIC $<$<BOOL:${BUILD_SHARED_LIBS}>:JSON_DLL>
|
||||
PRIVATE $<$<BOOL:${BUILD_SHARED_LIBS}>:JSON_DLL_BUILD>)
|
||||
|
||||
set_target_properties(json
|
||||
PROPERTIES COMPILE_OPTIONS $<$<CXX_COMPILER_ID:MSVC>:/wd4702>)
|
||||
set_target_properties(json
|
||||
PROPERTIES COMPILE_OPTIONS $<$<CXX_COMPILER_ID:MSVC>:/wd4275>)
|
||||
|
||||
target_compile_options(json
|
||||
PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/wd4702>
|
||||
PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/wd4275>)
|
||||
|
||||
target_include_directories(json PUBLIC
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/jsoncpp/dist>)
|
||||
|
||||
+1
-1
@@ -416,7 +416,7 @@ public:
|
||||
virtual ~Exception() throw();
|
||||
virtual char const* what() const throw();
|
||||
protected:
|
||||
void operator = (const Exception&);
|
||||
void operator = (const Exception&) = delete;
|
||||
std::string const msg_;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user