Use polly_init to define TAG, NAME and generator

ruslo · ruslo · commit fc94288298fa · 2014-07-14T09:55:43.000+04:00
diff --git a/analyze.cmake b/analyze.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Clang static analyzer / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/clang_libstdcxx.cmake b/clang_libstdcxx.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "clang / GNU Standard C++ Library (libstdc++) / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/custom_libcxx.cmake b/custom_libcxx.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "clang / Custom LLVM Standard C++ Library (libc++) / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/cygwin.cmake b/cygwin.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "cygwin / gcc / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/gcc.cmake b/gcc.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "gcc / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/gcc48.cmake b/gcc48.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "gcc 4.8 / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/ios-i386-armv7.cmake b/ios-i386-armv7.cmake
@@ -13,6 +13,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "iOS Universal (iphoneos + iphonesimulator) / i386 / armv7 / c++11 support"
+    "Xcode"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
@@ -27,8 +28,5 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
 set(IPHONEOS_ARCHS armv7)
 set(IPHONESIMULATOR_ARCHS i386)
 
-# support for hunter (github.com/ruslo/hunter)
-set(HUNTER_CMAKE_GENERATOR Xcode)
-
 include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
diff --git a/ios-nocodesign.cmake b/ios-nocodesign.cmake
@@ -13,6 +13,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "iOS Universal (iphoneos + iphonesimulator) / No code sign / c++11 support"
+    "Xcode"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
@@ -56,8 +57,5 @@ endif()
 set(IPHONEOS_ARCHS armv7;armv7s;arm64)
 set(IPHONESIMULATOR_ARCHS i386;x86_64)
 
-# support for hunter (github.com/ruslo/hunter)
-set(HUNTER_CMAKE_GENERATOR Xcode)
-
 include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
diff --git a/ios.cmake b/ios.cmake
@@ -13,6 +13,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "iOS Universal (iphoneos + iphonesimulator) / c++11 support"
+    "Xcode"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
@@ -27,8 +28,5 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
 set(IPHONEOS_ARCHS armv7;armv7s;arm64)
 set(IPHONESIMULATOR_ARCHS i386;x86_64)
 
-# support for hunter (github.com/ruslo/hunter)
-set(HUNTER_CMAKE_GENERATOR Xcode)
-
 include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
diff --git a/libcxx.cmake b/libcxx.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "clang / LLVM Standard C++ Library (libc++) / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/mingw.cmake b/mingw.cmake
@@ -11,11 +11,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "mingw / gcc / c++11 support"
+    "MinGW Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
 
 include("${CMAKE_CURRENT_LIST_DIR}/compiler/gcc.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
-
-set(HUNTER_CMAKE_GENERATOR "MinGW Makefiles")
diff --git a/nmake-vs2013-x64.cmake b/nmake-vs2013-x64.cmake
@@ -11,10 +11,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "NMake / Visual Studio 2013 / x64"
+    "NMake Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/compiler/msvc-2013.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/arch/msvc-x64.cmake")
-
-set(HUNTER_CMAKE_GENERATOR "NMake Makefiles")
diff --git a/nmake-vs2013.cmake b/nmake-vs2013.cmake
@@ -11,10 +11,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "NMake / Visual Studio 2013 / x86"
+    "NMake Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/compiler/msvc-2013.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/arch/msvc-x86.cmake")
-
-set(HUNTER_CMAKE_GENERATOR "NMake Makefiles")
diff --git a/sanitize_address.cmake b/sanitize_address.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Clang address sanitizer / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/sanitize_leak.cmake b/sanitize_leak.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Clang memory leaks sanitizer / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/sanitize_memory.cmake b/sanitize_memory.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Clang memory sanitizer / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/sanitize_thread.cmake b/sanitize_thread.cmake
@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Clang thread sanitizer / c++11 support"
+    "Unix Makefiles"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
diff --git a/xcode.cmake b/xcode.cmake
@@ -11,16 +11,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
 
 polly_init(
     "Xcode / LLVM Standard C++ Library (libc++) / c++11 support"
+    "Xcode"
 )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
 
-if(NOT XCODE_VERSION)
-  polly_fatal_error("This toolchain is available only for Xcode")
-endif()
-
-set(HUNTER_CMAKE_GENERATOR Xcode)
-
 execute_process(
     COMMAND
     xcrun --find clang

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")`
`11`	`11`
`12`	`12`	`polly_init(`
`13`	`13`	`"Clang static analyzer / c++11 support"`
	`14`	`+ "Unix Makefiles"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")`