You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/03/02 20:53:17 UTC
qpid-proton git commit: PROTON-1153: [C++ binding] Finish renaming
PN_... -> PN_CPP_... - Fix Windows compiler feature detection
Repository: qpid-proton
Updated Branches:
refs/heads/master 2a8bc3c14 -> 1832e3269
PROTON-1153: [C++ binding] Finish renaming PN_... -> PN_CPP_...
- Fix Windows compiler feature detection
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1832e326
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1832e326
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1832e326
Branch: refs/heads/master
Commit: 1832e326900b2cffd9dac71040dd44468b55674c
Parents: 2a8bc3c
Author: Andrew Stitcher <as...@apache.org>
Authored: Wed Mar 2 14:52:01 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Mar 2 14:52:01 2016 -0500
----------------------------------------------------------------------
cpp.cmake | 34 -------------------------------
proton-c/bindings/cpp/CMakeLists.txt | 2 +-
proton-c/bindings/cpp/cpp.cmake | 34 +++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1832e326/cpp.cmake
----------------------------------------------------------------------
diff --git a/cpp.cmake b/cpp.cmake
deleted file mode 100644
index 0998546..0000000
--- a/cpp.cmake
+++ /dev/null
@@ -1,34 +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.
-#
-
-# Check C++ capabilities.
-
-include(CheckCXXSourceCompiles)
-
-if (CMAKE_CXX_COMPILER)
- set(CMAKE_REQUIRED_FLAGS "${CXX_WARNING_FLAGS}")
- check_cxx_source_compiles("long long ll; int main(int, char**) { return 0; }" HAS_LONG_LONG)
- if (HAS_LONG_LONG)
- add_definitions(-DPN_HAS_LONG_LONG=1)
- endif()
- check_cxx_source_compiles("#include <memory>\nstd::shared_ptr<int> i; std::unique_ptr<int> u; int main(int, char**) { return 0; }" HAS_STD_PTR)
- if (HAS_STD_PTR)
- add_definitions(-DPN_HAS_STD_PTR=1)
- endif()
-endif()
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1832e326/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 81a00ed..c435e20 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -17,7 +17,7 @@
# under the License.
#
-include(${CMAKE_SOURCE_DIR}/cpp.cmake) # Compiler checks
+include(cpp.cmake) # Compiler checks
include_directories(
"${CMAKE_SOURCE_DIR}/proton-c/include"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1832e326/proton-c/bindings/cpp/cpp.cmake
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/cpp.cmake b/proton-c/bindings/cpp/cpp.cmake
new file mode 100644
index 0000000..3f4c313
--- /dev/null
+++ b/proton-c/bindings/cpp/cpp.cmake
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+# Check C++ capabilities.
+
+include(CheckCXXSourceCompiles)
+
+if (CMAKE_CXX_COMPILER)
+ set(CMAKE_REQUIRED_FLAGS "${CXX_WARNING_FLAGS}")
+ check_cxx_source_compiles("long long ll; int main(int, char**) { return 0; }" HAS_LONG_LONG)
+ if (HAS_LONG_LONG)
+ add_definitions(-DPN_CPP_HAS_LONG_LONG=1)
+ endif()
+ check_cxx_source_compiles("#include <memory>\nstd::shared_ptr<int> i; std::unique_ptr<int> u; int main(int, char**) { return 0; }" HAS_STD_PTR)
+ if (HAS_STD_PTR)
+ add_definitions(-DPN_CPP_HAS_STD_PTR=1)
+ endif()
+endif()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org