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/14 22:07:27 UTC
[2/2] thrift git commit: THRIFT-3090 cmake build is broken (set CMake
version to 2.8.12)
THRIFT-3090 cmake build is broken (set CMake version to 2.8.12)
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/8f27189d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/8f27189d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/8f27189d
Branch: refs/heads/master
Commit: 8f27189dfd2812a9aa5bd57ce7155fbc295440ad
Parents: afc3777
Author: Roger Meier <ro...@apache.org>
Authored: Tue Apr 14 22:05:50 2015 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Tue Apr 14 22:05:50 2015 +0200
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
compiler/cpp/CMakeLists.txt | 3 ---
lib/c_glib/CMakeLists.txt | 3 ---
lib/cpp/CMakeLists.txt | 4 ----
lib/cpp/src/thrift/qt/CMakeLists.txt | 3 ---
lib/cpp/test/CMakeLists.txt | 1 -
lib/cpp/test/qt/CMakeLists.txt | 3 ---
lib/java/CMakeLists.txt | 3 ---
8 files changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20d069..2800167 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
#
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
project(thrift)
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/compiler/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt
index ddbe9ea..5642d16 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/lib/c_glib/CMakeLists.txt
----------------------------------------------------------------------
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})
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/lib/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 9075c56..82cd042 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)
@@ -171,7 +168,6 @@ 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/8f27189d/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 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/lib/cpp/test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt
index a1c44c3..721053a 100644
--- a/lib/cpp/test/CMakeLists.txt
+++ b/lib/cpp/test/CMakeLists.txt
@@ -236,7 +236,6 @@ 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/8f27189d/lib/cpp/test/qt/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/cpp/test/qt/CMakeLists.txt b/lib/cpp/test/qt/CMakeLists.txt
index e899791..00f2ddb 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/8f27189d/lib/java/CMakeLists.txt
----------------------------------------------------------------------
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()