You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/06/26 18:27:05 UTC
mesos git commit: Renamed APR and SVN `find_package` implementations.
Repository: mesos
Updated Branches:
refs/heads/master 4cdddf687 -> b648f6987
Renamed APR and SVN `find_package` implementations.
Upstream follows a convention of using ALL UPERCASE letters for
package names for implementations of `FindPACKAGE.cmake`. This patch
renames our `find_package` implementations fro APR and SVN.
Review: https://reviews.apache.org/r/67738/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b648f698
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b648f698
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b648f698
Branch: refs/heads/master
Commit: b648f6987a39d0f1911ebf39e005584b10042866
Parents: 4cdddf6
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Jun 26 11:16:09 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Tue Jun 26 11:16:09 2018 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 4 ++--
3rdparty/stout/cmake/FindAPR.cmake | 42 +++++++++++++++++++++++++++++++++
3rdparty/stout/cmake/FindApr.cmake | 42 ---------------------------------
3rdparty/stout/cmake/FindSVN.cmake | 41 ++++++++++++++++++++++++++++++++
3rdparty/stout/cmake/FindSvn.cmake | 41 --------------------------------
5 files changed, 85 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b648f698/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 8128808..5e46b41 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -640,7 +640,7 @@ if (WIN32)
URL ${LIBAPR_URL}
URL_HASH ${LIBAPR_HASH})
else ()
- find_package(Apr REQUIRED)
+ find_package(APR REQUIRED)
add_library(apr SHARED IMPORTED)
set_target_properties(
@@ -656,7 +656,7 @@ endif ()
if (NOT WIN32)
# NOTE: This does not use `FindSubversion` because it finds the `svn`
# executable, but we're looking for the library.
- find_package(Svn REQUIRED)
+ find_package(SVN REQUIRED)
add_library(svn INTERFACE)
target_include_directories(svn INTERFACE ${SVN_INCLUDE_DIR})
http://git-wip-us.apache.org/repos/asf/mesos/blob/b648f698/3rdparty/stout/cmake/FindAPR.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindAPR.cmake b/3rdparty/stout/cmake/FindAPR.cmake
new file mode 100644
index 0000000..b6cc740
--- /dev/null
+++ b/3rdparty/stout/cmake/FindAPR.cmake
@@ -0,0 +1,42 @@
+# 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.
+
+include(FindPackageHelper)
+
+# NOTE: If this fails, stderr is ignored, and the output variable is empty.
+# This has no deleterious effect on our path search.
+execute_process(
+ COMMAND brew --prefix apr
+ OUTPUT_VARIABLE APR_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(POSSIBLE_APR_INCLUDE_DIRS
+ ${APR_PREFIX}/libexec/include/apr-1
+ /usr/local/include/apr-1
+ /usr/local/include/apr-1.0
+ /usr/local/apr/include/apr-1
+ /usr/include/apr-1
+ /usr/include/apr-1.0)
+
+set(POSSIBLE_APR_LIB_DIRS
+ ${APR_PREFIX}/libexec/lib
+ /usr/local/apr/lib
+ /usr/local/lib
+ /usr/lib)
+
+set(APR_LIBRARY_NAMES apr-1)
+
+FIND_PACKAGE_HELPER(APR apr.h)
http://git-wip-us.apache.org/repos/asf/mesos/blob/b648f698/3rdparty/stout/cmake/FindApr.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindApr.cmake b/3rdparty/stout/cmake/FindApr.cmake
deleted file mode 100644
index b6cc740..0000000
--- a/3rdparty/stout/cmake/FindApr.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.
-
-include(FindPackageHelper)
-
-# NOTE: If this fails, stderr is ignored, and the output variable is empty.
-# This has no deleterious effect on our path search.
-execute_process(
- COMMAND brew --prefix apr
- OUTPUT_VARIABLE APR_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(POSSIBLE_APR_INCLUDE_DIRS
- ${APR_PREFIX}/libexec/include/apr-1
- /usr/local/include/apr-1
- /usr/local/include/apr-1.0
- /usr/local/apr/include/apr-1
- /usr/include/apr-1
- /usr/include/apr-1.0)
-
-set(POSSIBLE_APR_LIB_DIRS
- ${APR_PREFIX}/libexec/lib
- /usr/local/apr/lib
- /usr/local/lib
- /usr/lib)
-
-set(APR_LIBRARY_NAMES apr-1)
-
-FIND_PACKAGE_HELPER(APR apr.h)
http://git-wip-us.apache.org/repos/asf/mesos/blob/b648f698/3rdparty/stout/cmake/FindSVN.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindSVN.cmake b/3rdparty/stout/cmake/FindSVN.cmake
new file mode 100644
index 0000000..eed7590
--- /dev/null
+++ b/3rdparty/stout/cmake/FindSVN.cmake
@@ -0,0 +1,41 @@
+# 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.
+
+include(FindPackageHelper)
+
+# NOTE: If this fails, stderr is ignored, and the output variable is empty.
+# This has no deleterious effect on our path search.
+execute_process(
+ COMMAND brew --prefix subversion
+ OUTPUT_VARIABLE SVN_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(POSSIBLE_SVN_INCLUDE_DIRS
+ ${SVN_PREFIX}/include/subversion-1
+ /usr/include/subversion-1
+ /usr/local/include/subversion-1)
+
+set(POSSIBLE_SVN_LIB_DIRS
+ ${SVN_PREFIX}/lib
+ /usr/lib
+ /usr/local/lib)
+
+set(SVN_LIBRARY_NAMES
+ svn_delta-1
+ svn_diff-1
+ svn_subr-1)
+
+FIND_PACKAGE_HELPER(SVN svn_client.h)
http://git-wip-us.apache.org/repos/asf/mesos/blob/b648f698/3rdparty/stout/cmake/FindSvn.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindSvn.cmake b/3rdparty/stout/cmake/FindSvn.cmake
deleted file mode 100644
index eed7590..0000000
--- a/3rdparty/stout/cmake/FindSvn.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.
-
-include(FindPackageHelper)
-
-# NOTE: If this fails, stderr is ignored, and the output variable is empty.
-# This has no deleterious effect on our path search.
-execute_process(
- COMMAND brew --prefix subversion
- OUTPUT_VARIABLE SVN_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(POSSIBLE_SVN_INCLUDE_DIRS
- ${SVN_PREFIX}/include/subversion-1
- /usr/include/subversion-1
- /usr/local/include/subversion-1)
-
-set(POSSIBLE_SVN_LIB_DIRS
- ${SVN_PREFIX}/lib
- /usr/lib
- /usr/local/lib)
-
-set(SVN_LIBRARY_NAMES
- svn_delta-1
- svn_diff-1
- svn_subr-1)
-
-FIND_PACKAGE_HELPER(SVN svn_client.h)