You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2015/04/12 21:45:25 UTC
[1/2] thrift git commit: Revert "THRIFT-3014 AppVeyor support - fix
format"
Repository: thrift
Updated Branches:
refs/heads/master 81b3c440c -> 5d0a80678
Revert "THRIFT-3014 AppVeyor support - fix format"
This reverts commit 81b3c440c64a372b6e47f9cb50804bd60f83e83f.
commit included modified CMakeLists.txt files, as part from local test
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5af78c87
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5af78c87
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5af78c87
Branch: refs/heads/master
Commit: 5af78c8776a668c6b46a1eba33823a068d16f1f3
Parents: 81b3c44
Author: Roger Meier <ro...@apache.org>
Authored: Sun Apr 12 21:43:12 2015 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Apr 12 21:43:12 2015 +0200
----------------------------------------------------------------------
CMakeLists.txt | 4 +---
appveyor.yml | 6 +++---
compiler/cpp/CMakeLists.txt | 5 ++++-
lib/c_glib/CMakeLists.txt | 3 +++
lib/cpp/CMakeLists.txt | 4 ++++
lib/cpp/src/thrift/qt/CMakeLists.txt | 3 +++
lib/cpp/test/CMakeLists.txt | 2 ++
lib/cpp/test/qt/CMakeLists.txt | 4 ++++
lib/java/CMakeLists.txt | 3 +++
9 files changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e5636a..f20d069 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,7 +18,7 @@
#
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 2.8)
project(thrift)
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 0c5bfdf..4350083 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ environment:
BOOST_ROOT: c:\Libraries\boost
BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
-install:
+ install:
- cinst cmake
- cinst nsis
- cinst ant
@@ -49,5 +49,5 @@ build_script:
- cmake --build . --config Release
- cpack
-#TODO enable testing
-#TODO make it perfect ;-r
+TODO enable testing
+TODO make it perfect ;-r
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/compiler/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt
index 26bf7ca..ddbe9ea 100644
--- a/compiler/cpp/CMakeLists.txt
+++ b/compiler/cpp/CMakeLists.txt
@@ -17,6 +17,9 @@
# 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
@@ -49,7 +52,7 @@ set(libparse_SOURCES
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
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/c_glib/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt
index 2c0ce76..b5cb696 100644
--- a/lib/c_glib/CMakeLists.txt
+++ b/lib/c_glib/CMakeLists.txt
@@ -17,6 +17,9 @@
# under the License.
#
+
+cmake_minimum_required(VERSION 2.8)
+
# Find required packages
find_package(GLIB REQUIRED COMPONENTS gobject)
include_directories(${GLIB_INCLUDE_DIRS})
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/cpp/CMakeLists.txt
----------------------------------------------------------------------
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 @@ if(WITH_ZLIB)
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})
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/cpp/src/thrift/qt/CMakeLists.txt
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/cpp/test/CMakeLists.txt
----------------------------------------------------------------------
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 @@ add_test(NAME OpenSSLManualInitTest COMMAND OpenSSLManualInitTest)
endif()
if(WITH_QT4)
+cmake_minimum_required(VERSION 2.8.12)
set(CMAKE_AUTOMOC ON)
find_package(Qt4 REQUIRED COMPONENTS QtTest)
set(TQTcpServerTest_SOURCES
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/cpp/test/qt/CMakeLists.txt
----------------------------------------------------------------------
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 @@ set(TQTcpServerTest_Qt5_SOURCES
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)
+
http://git-wip-us.apache.org/repos/asf/thrift/blob/5af78c87/lib/java/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/java/CMakeLists.txt b/lib/java/CMakeLists.txt
index ba11f34..e915078 100644
--- a/lib/java/CMakeLists.txt
+++ b/lib/java/CMakeLists.txt
@@ -17,6 +17,9 @@
# under the License.
#
+
+cmake_minimum_required(VERSION 2.8)
+
if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
set(JAVA_INSTALL_DIR "${LIB_INSTALL_DIR}/java")
else()
[2/2] thrift git commit: THRIFT-3014 AppVeyor support - fix format
Posted by ro...@apache.org.
THRIFT-3014 AppVeyor support - fix format
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5d0a8067
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5d0a8067
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5d0a8067
Branch: refs/heads/master
Commit: 5d0a8067851ab01369357ddb0ddf25782bd34ccc
Parents: 5af78c8
Author: Roger Meier <ro...@apache.org>
Authored: Sun Apr 12 21:06:11 2015 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Apr 12 21:45:11 2015 +0200
----------------------------------------------------------------------
appveyor.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5d0a8067/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 4350083..0c5bfdf 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ environment:
BOOST_ROOT: c:\Libraries\boost
BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
- install:
+install:
- cinst cmake
- cinst nsis
- cinst ant
@@ -49,5 +49,5 @@ build_script:
- cmake --build . --config Release
- cpack
-TODO enable testing
-TODO make it perfect ;-r
+#TODO enable testing
+#TODO make it perfect ;-r