Ability to select compiler with -DXCODE_COMPILER={gcc,llvmgcc,clang} for CMake build system. Default to Release builds for CMake.

This makes sure that Mumble for iOS BetaDist builds are built against Release builds of MumbleKit.

5 files changed, 5 insertions, 5 deletions

diff --git a/3rdparty/celt-0.7.0-build/CMakeLists.txt b/3rdparty/celt-0.7.0-build/CMakeLists.txt
index de02739..e5fe791 100644
--- a/3rdparty/celt-0.7.0-build/CMakeLists.txt
+++ b/3rdparty/celt-0.7.0-build/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_LIBRARY(CELT-0.7.0 STATIC
 )
 
 TARGET_LINK_LIBRARIES(CELT-0.7.0)
-SET_TARGET_PROPERTIES(CELT-0.7.0 PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+SET_TARGET_PROPERTIES(CELT-0.7.0 PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION ${MUMBLEKIT_GCC_VERSION})
 SET_TARGET_PROPERTIES(CELT-0.7.0 PROPERTIES XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD "c99")
 SET_TARGET_PROPERTIES(CELT-0.7.0 PROPERTIES XCODE_ATTRIBUTE_"GCC_THUMB_SUPPORT[arch=armv6]" "NO")
 SET_TARGET_PROPERTIES(CELT-0.7.0 PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES")
diff --git a/3rdparty/opensslbuild/CMakeLists.txt b/3rdparty/opensslbuild/CMakeLists.txt
index 6396fc0..a66994b 100644
--- a/3rdparty/opensslbuild/CMakeLists.txt
+++ b/3rdparty/opensslbuild/CMakeLists.txt
@@ -754,7 +754,7 @@ ADD_LIBRARY(OpenSSL STATIC
 )
 
 TARGET_LINK_LIBRARIES(OpenSSL)
-SET_TARGET_PROPERTIES(OpenSSL PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+SET_TARGET_PROPERTIES(OpenSSL PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION ${MUMBLEKIT_GCC_VERSION})
 SET_TARGET_PROPERTIES(OpenSSL PROPERTIES XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD "c99")
 SET_TARGET_PROPERTIES(OpenSSL PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
 SET_TARGET_PROPERTIES(OpenSSL PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${PROJECT_SOURCE_DIR}/3rdparty/opensslbuild/OpenSSL.pch")
diff --git a/3rdparty/protobufbuild/CMakeLists.txt b/3rdparty/protobufbuild/CMakeLists.txt
index af0a7f8..2fc642e 100644
--- a/3rdparty/protobufbuild/CMakeLists.txt
+++ b/3rdparty/protobufbuild/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_LIBRARY(ProtocolBuffers STATIC
 )
 
 TARGET_LINK_LIBRARIES(ProtocolBuffers)
-SET_TARGET_PROPERTIES(ProtocolBuffers PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+SET_TARGET_PROPERTIES(ProtocolBuffers PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION ${MUMBLEKIT_GCC_VERSION})
 SET_TARGET_PROPERTIES(ProtocolBuffers PROPERTIES XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD "c99")
 SET_TARGET_PROPERTIES(ProtocolBuffers PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
 SET_TARGET_PROPERTIES(ProtocolBuffers PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${SRCDIR}/ProtocolBuffers_Prefix.pch")
diff --git a/3rdparty/speexbuild/CMakeLists.txt b/3rdparty/speexbuild/CMakeLists.txt
index e1c9ac2..ac189fe 100644
--- a/3rdparty/speexbuild/CMakeLists.txt
+++ b/3rdparty/speexbuild/CMakeLists.txt
@@ -49,7 +49,7 @@ ADD_LIBRARY(Speex STATIC
 )
 
 TARGET_LINK_LIBRARIES(Speex)
-SET_TARGET_PROPERTIES(Speex PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+SET_TARGET_PROPERTIES(Speex PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION ${MUMBLEKIT_GCC_VERSION})
 SET_TARGET_PROPERTIES(Speex PROPERTIES XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD "c99")
 SET_TARGET_PROPERTIES(Speex PROPERTIES XCODE_ATTRIBUTE_"GCC_THUMB_SUPPORT[arch=armv6]" "NO")
 SET_TARGET_PROPERTIES(Speex PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES")
diff --git a/3rdparty/speexdspbuild/CMakeLists.txt b/3rdparty/speexdspbuild/CMakeLists.txt
index f99f2dd..b9311b2 100644
--- a/3rdparty/speexdspbuild/CMakeLists.txt
+++ b/3rdparty/speexdspbuild/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_LIBRARY(SpeexDSP STATIC
 )
 
 TARGET_LINK_LIBRARIES(SpeexDSP)
-SET_TARGET_PROPERTIES(SpeexDSP PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+SET_TARGET_PROPERTIES(SpeexDSP PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION ${MUMBLEKIT_GCC_VERSION})
 SET_TARGET_PROPERTIES(SpeexDSP PROPERTIES XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD "c99")
 SET_TARGET_PROPERTIES(SpeexDSP PROPERTIES XCODE_ATTRIBUTE_"GCC_THUMB_SUPPORT[arch=armv6]" "NO")
 SET_TARGET_PROPERTIES(SpeexDSP PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES")