THRIFT-3014 AppVeyor support - fix format
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20d069..5e5636a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+
+
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,7 +20,7 @@
#
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0.2)
project(thrift)
diff --git a/appveyor.yml b/appveyor.yml
index 4350083..0c5bfdf 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@
BOOST_ROOT: c:\Libraries\boost
BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
- install:
+install:
- cinst cmake
- cinst nsis
- cinst ant
@@ -49,5 +49,5 @@
- cmake --build . --config Release
- cpack
-TODO enable testing
-TODO make it perfect ;-r
+#TODO enable testing
+#TODO make it perfect ;-r
diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt
index ddbe9ea..26bf7ca 100644
--- a/compiler/cpp/CMakeLists.txt
+++ b/compiler/cpp/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8)
-
# Windows has a different header
if(MSVC)
set(FLEX_FLAGS "--wincompat") # Don't use unistd.h on windows
@@ -52,7 +49,7 @@
add_library(libparse STATIC ${libparse_SOURCES})
# Create the thrift compiler
-set( thrift_SOURCES
+set( thrift_SOURCES
src/main.cc
src/md5.c
src/generate/t_generator.cc
diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt
index b5cb696..2c0ce76 100644
--- a/lib/c_glib/CMakeLists.txt
+++ b/lib/c_glib/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8)
-
# Find required packages
find_package(GLIB REQUIRED COMPONENTS gobject)
include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 4c73986..2f066db 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8)
-
# Find required packages
if(WITH_BOOSTTHREADS)
find_package(Boost 1.53.0 REQUIRED COMPONENTS system thread)
@@ -173,7 +170,6 @@
endif()
if(WITH_QT4)
- cmake_minimum_required(VERSION 2.8.12)
set(CMAKE_AUTOMOC ON)
find_package(Qt4 REQUIRED COMPONENTS QtCore QtNetwork)
ADD_LIBRARY_THRIFT(thriftqt ${thriftcppqt_SOURCES})
diff --git a/lib/cpp/src/thrift/qt/CMakeLists.txt b/lib/cpp/src/thrift/qt/CMakeLists.txt
index 1758b3e..c657938 100644
--- a/lib/cpp/src/thrift/qt/CMakeLists.txt
+++ b/lib/cpp/src/thrift/qt/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8.12)
-
set( thriftcppqt5_SOURCES
TQIODeviceTransport.cpp
TQTcpServer.cpp
diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt
index a1c44c3..ba63a4d 100644
--- a/lib/cpp/test/CMakeLists.txt
+++ b/lib/cpp/test/CMakeLists.txt
@@ -17,7 +17,6 @@
# under the License.
#
-
# Find required packages
set(Boost_USE_STATIC_LIBS ON) # Force the use of static boost test framework
find_package(Boost 1.53.0 REQUIRED COMPONENTS unit_test_framework)
@@ -236,7 +235,6 @@
endif()
if(WITH_QT4)
-cmake_minimum_required(VERSION 2.8.12)
set(CMAKE_AUTOMOC ON)
find_package(Qt4 REQUIRED COMPONENTS QtTest)
set(TQTcpServerTest_SOURCES
diff --git a/lib/cpp/test/qt/CMakeLists.txt b/lib/cpp/test/qt/CMakeLists.txt
index e899791..5bb5eb2 100644
--- a/lib/cpp/test/qt/CMakeLists.txt
+++ b/lib/cpp/test/qt/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8.12)
-
set(CMAKE_AUTOMOC ON)
find_package(Qt5 REQUIRED COMPONENTS Test)
set(TQTcpServerTest_Qt5_SOURCES
@@ -28,4 +25,3 @@
add_executable(TQTcpServerTest_Qt5 ${TQTcpServerTest_Qt5_SOURCES})
target_link_libraries(TQTcpServerTest_Qt5 testgencpp_cob thriftqt5 thrift Qt5::Test)
add_test(NAME TQTcpServerTest_Qt5 COMMAND TQTcpServerTest_Qt5)
-
diff --git a/lib/java/CMakeLists.txt b/lib/java/CMakeLists.txt
index e915078..ba11f34 100644
--- a/lib/java/CMakeLists.txt
+++ b/lib/java/CMakeLists.txt
@@ -17,9 +17,6 @@
# under the License.
#
-
-cmake_minimum_required(VERSION 2.8)
-
if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
set(JAVA_INSTALL_DIR "${LIB_INSTALL_DIR}/java")
else()