You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/10/04 18:35:36 UTC
[6/6] storm git commit: STORM-1081. Import json11 and gmock into the
storm-sql project.
STORM-1081. Import json11 and gmock into the storm-sql project.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/92a3fcde
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/92a3fcde
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/92a3fcde
Branch: refs/heads/STORM-1040
Commit: 92a3fcde76bdba15d203ab8fc87b866b36ca0e7a
Parents: 2d50329
Author: Haohui Mai <wh...@apache.org>
Authored: Thu Sep 24 15:43:17 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Thu Oct 1 15:37:44 2015 -0700
----------------------------------------------------------------------
.../storm-sql-core/src/native/CMakeLists.txt | 6 +-
.../src/native/third_party/CMakeLists.txt | 20 +
.../third_party/gmock-1.7.0/CMakeLists.txt | 2 +
.../src/native/third_party/gmock-1.7.0/LICENSE | 28 +
.../third_party/gmock-1.7.0/gmock-gtest-all.cc | 11443 ++++++++++
.../third_party/gmock-1.7.0/gmock/gmock.h | 14198 ++++++++++++
.../third_party/gmock-1.7.0/gmock_main.cc | 54 +
.../third_party/gmock-1.7.0/gtest/gtest.h | 20061 +++++++++++++++++
.../native/third_party/json11/CMakeLists.txt | 19 +
.../native/third_party/json11/json11/json11.cpp | 705 +
.../native/third_party/json11/json11/json11.hpp | 200 +
11 files changed, 46735 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/92a3fcde/external/sql/storm-sql-core/src/native/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/src/native/CMakeLists.txt b/external/sql/storm-sql-core/src/native/CMakeLists.txt
index 6c0502c..9e81c6b 100644
--- a/external/sql/storm-sql-core/src/native/CMakeLists.txt
+++ b/external/sql/storm-sql-core/src/native/CMakeLists.txt
@@ -41,7 +41,11 @@ if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
-include_directories(include)
+include_directories(
+ include
+ third_party/gmock-1.7.0
+ third_party/json11)
add_subdirectory(lib)
add_subdirectory(bindings)
+add_subdirectory(third_party)
http://git-wip-us.apache.org/repos/asf/storm/blob/92a3fcde/external/sql/storm-sql-core/src/native/third_party/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/src/native/third_party/CMakeLists.txt b/external/sql/storm-sql-core/src/native/third_party/CMakeLists.txt
new file mode 100644
index 0000000..efc9e97
--- /dev/null
+++ b/external/sql/storm-sql-core/src/native/third_party/CMakeLists.txt
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+add_subdirectory(json11)
+add_subdirectory(gmock-1.7.0)
http://git-wip-us.apache.org/repos/asf/storm/blob/92a3fcde/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/CMakeLists.txt b/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/CMakeLists.txt
new file mode 100644
index 0000000..57934a6
--- /dev/null
+++ b/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers -Wno-unused-const-variable")
+add_library(gmock_main gmock-gtest-all.cc gmock_main.cc)
http://git-wip-us.apache.org/repos/asf/storm/blob/92a3fcde/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/LICENSE
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/LICENSE b/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/LICENSE
new file mode 100644
index 0000000..1941a11
--- /dev/null
+++ b/external/sql/storm-sql-core/src/native/third_party/gmock-1.7.0/LICENSE
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.