Revert "THRIFT-3014 AppVeyor support - fix format"
This reverts commit 81b3c440c64a372b6e47f9cb50804bd60f83e83f.
commit included modified CMakeLists.txt files, as part from local test
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 2f066db..4c73986 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -17,6 +17,9 @@
# 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)
@@ -170,6 +173,7 @@
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 c657938..1758b3e 100644
--- a/lib/cpp/src/thrift/qt/CMakeLists.txt
+++ b/lib/cpp/src/thrift/qt/CMakeLists.txt
@@ -17,6 +17,9 @@
# 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 ba63a4d..a1c44c3 100644
--- a/lib/cpp/test/CMakeLists.txt
+++ b/lib/cpp/test/CMakeLists.txt
@@ -17,6 +17,7 @@
# 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)
@@ -235,6 +236,7 @@
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 5bb5eb2..e899791 100644
--- a/lib/cpp/test/qt/CMakeLists.txt
+++ b/lib/cpp/test/qt/CMakeLists.txt
@@ -17,6 +17,9 @@
# under the License.
#
+
+cmake_minimum_required(VERSION 2.8.12)
+
set(CMAKE_AUTOMOC ON)
find_package(Qt5 REQUIRED COMPONENTS Test)
set(TQTcpServerTest_Qt5_SOURCES
@@ -25,3 +28,4 @@
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)
+