diff options
| author | Robert Gemmell <robbie@apache.org> | 2016-07-05 21:55:35 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2016-07-05 21:55:35 +0000 |
| commit | f160cb6566c17945f7ebc4f3a752b2cc6a051685 (patch) | |
| tree | 809f04fc1967c22e5abc52de07602555bed0e920 /qpid/cpp/CMakeModules | |
| parent | ebb276cca41582b73223b55eff9f2d4386f4f746 (diff) | |
| download | qpid-python-f160cb6566c17945f7ebc4f3a752b2cc6a051685.tar.gz | |
QPID-7207: remove cpp and python subdirs from svn trunk, they have migrated to their own git repositories
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1751566 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/CMakeModules')
| -rwxr-xr-x | qpid/cpp/CMakeModules/CheckSizetDistinct.cmake | 55 | ||||
| -rw-r--r-- | qpid/cpp/CMakeModules/FindProton.cmake | 82 |
2 files changed, 0 insertions, 137 deletions
diff --git a/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake b/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake deleted file mode 100755 index 463a37d4a8..0000000000 --- a/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake +++ /dev/null @@ -1,55 +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. -# - -# This module checks to see if size_t is a distinct type from the other -# integer types already set up in IntegerTypes.h. - -INCLUDE (CheckCXXSourceCompiles) - -FUNCTION (check_size_t_distinct VARIABLE) - # No need to check if we already did. If you want to re-run, clear it - # from the cache. - if (NOT DEFINED ${VARIABLE}) - message (STATUS "Check for size_t") - set (CMAKE_REQUIRED_QUIET ON) - set (CMAKE_REQUIRED_INCLUDES "${CMAKE_SOURCE_DIR}/include") - CHECK_CXX_SOURCE_COMPILES ( -" -#include \"qpid/sys/IntegerTypes.h\" -// Define functions that will fail to compile if size_t is the same as -// one of the int types defined in IntegerTypes.h -int foo(int16_t) { return 1; } -int foo(int32_t) { return 2; } -int foo(int64_t) { return 3; } -int foo(uint16_t) { return 4; } -int foo(uint32_t) { return 5; } -int foo(uint64_t) { return 6; } -int foo(size_t) { return 7; } -int main (int, char *[]) { - return 0; -} -" - ${VARIABLE}) - if (${VARIABLE}) - message (STATUS "Check for size_t -- NOT a distinct type") - else (${VARIABLE}) - message (STATUS "Check for size_t -- distinct type") - endif (${VARIABLE}) - endif () -ENDFUNCTION (check_size_t_distinct VARIABLE) diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake deleted file mode 100644 index 71441fe1a7..0000000000 --- a/qpid/cpp/CMakeModules/FindProton.cmake +++ /dev/null @@ -1,82 +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(FindPackageHandleStandardArgs) -include(FindPackageMessage) - -# First try to find the Installed Proton config (Proton 0.7 and later) -find_package(Proton QUIET NO_MODULE) -if (Proton_FOUND) - find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") - return() -endif () - -# Now look for the cooky Proton config installed with some earlier -# versions of Proton -find_package(proton QUIET NO_MODULE) -if (proton_FOUND) - include("${proton_DIR}/libqpid-proton.cmake") - set (Proton_VERSION ${PROTON_VERSION}) - set (Proton_INCLUDE_DIRS ${PROTON_INCLUDE_DIRS}) - set (Proton_LIBRARIES ${PROTON_LIBRARIES}) - set (Proton_FOUND true) - find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") - return() -endif () - -# Now look for any pkg-config configuration -find_package(PkgConfig QUIET) - -if (PKG_CONFIG_FOUND) - # Check for cmake 2.6 - if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") - set (FindPkgQUIET QUIET) - endif() - - if (NOT Proton_FIND_VERSION) - pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton) - elseif(NOT Proton_FIND_VERSION_EXACT) - pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton>=${Proton_FIND_VERSION}) - else() - pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION}) - endif() - if (Proton_FOUND) - find_library(Proton_LIBRARY ${Proton_LIBRARIES} HINTS ${Proton_LIBRARY_DIRS}) - set (Proton_LIBRARIES ${Proton_LIBRARY}) - find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") - return() - endif () -endif() - -# Allow ccmake or command-line to set checked out but not installed Proton location -# Defaule location is ${HOME}/qpid-proton -set(Proton_CHECKOUT_DIR "$ENV{HOME}/qpid-proton" CACHE PATH "Proton checkout directory") -set(Proton_BUILD_DIR_NAME "build" CACHE STRING "Proton build directory name within Proton_CHECKOUT_DIR") -if (EXISTS ${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so) - include("${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/ProtonConfig.cmake") - set (Proton_INCLUDE_DIRS "${Proton_CHECKOUT_DIR}/proton-c/include" "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/include") - set (Proton_LIBRARIES "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so") - find_package_message(Proton "Found uninstalled Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR ${Proton_LIBRARIES} $Proton_VERSION") - return() -endif () - -# Proton not found print a standard error message -if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.3") - find_package_handle_standard_args(Proton CONFIG_MODE) -endif() |
