diff options
author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
---|---|---|
committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
commit | 9cdf435dac257e7e4a0598bac9491025b5605e64 (patch) | |
tree | 1438f7442281478154217c39dab08a935839c7ac /lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig | |
parent | a17bdf8dc89763c74aadc794ac8574da11dc1d99 (diff) | |
parent | 9839b45e764e5222054280190b6fe835522e2949 (diff) |
Merge branch 'master' into migrate-to-QJSEngine
# Conflicts:
# build/depends.py
# src/controllers/hid/hidcontroller.cpp
# src/controllers/hid/hidcontroller.h
Diffstat (limited to 'lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig')
-rw-r--r-- | lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig b/lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig deleted file mode 100644 index 357b1c8fbf..0000000000 --- a/lib/gmock-1.7.0/gtest/xcode/Config/FrameworkTarget.xcconfig +++ /dev/null @@ -1,17 +0,0 @@ -// -// FrameworkTarget.xcconfig -// -// These are Framework target settings for the gtest framework and examples. It -// is set in the "Based On:" dropdown in the "Target" info dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Dynamic libs need to be position independent -GCC_DYNAMIC_NO_PIC = NO - -// Dynamic libs should not have their external symbols stripped. -STRIP_STYLE = non-global - -// Let the user install by specifying the $DSTROOT with xcodebuild -SKIP_INSTALL = NO |