summaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-08-08 16:44:15 -0400
committerTom Rondeau <tom@trondeau.com>2014-08-08 16:44:15 -0400
commit4ac28002fbea740f78c2339446cca2d1f118628f (patch)
treec81ebb1aa487fdb3cc277415e68c360ef6c80b26 /cmake/Modules
parent41d0844328800cfc84c97e3961c39b5fafab11bb (diff)
parent3d5df0ddd3aa8d5a94285b95f487747f25d4ee06 (diff)
Merge branch 'maint'
Conflicts: gnuradio-runtime/CMakeLists.txt gnuradio-runtime/lib/controlport/CMakeLists.txt
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/FindICE-3.5.cmake127
-rw-r--r--cmake/Modules/FindICE.cmake127
2 files changed, 0 insertions, 254 deletions
diff --git a/cmake/Modules/FindICE-3.5.cmake b/cmake/Modules/FindICE-3.5.cmake
deleted file mode 100644
index f3dbb08003..0000000000
--- a/cmake/Modules/FindICE-3.5.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-# Override the search path for ICE; useful for manually installed libs.
-# set(ICE_MANUAL_INSTALL_PATH /opt/Ice-3.5.0/)
-
-message(STATUS "Checking for Ice-3.5")
-
-FIND_PATH(
- ICE_CONFIG_INCLUDE_DIR
- NAMES IceUtil/Config.h
- HINTS ${ICE_MANUAL_INSTALL_PATH}/include/ ${CMAKE_INSTALL_PREFIX}/include/
-)
-
-if(ICE_CONFIG_INCLUDE_DIR)
- file(STRINGS "${ICE_CONFIG_INCLUDE_DIR}/IceUtil/Config.h"
- ICE_STRING_VERSION REGEX "ICE_STRING_VERSION")
- string(REGEX MATCH "3.5" ICE_FOUND ${ICE_STRING_VERSION})
- if(ICE_FOUND)
- set(ICE_FOUND TRUE)
- endif(ICE_FOUND)
-endif(ICE_CONFIG_INCLUDE_DIR)
-
-if(NOT ICE_FOUND)
- message(STATUS " package 'Ice-3.5' not found")
-
-else(NOT ICE_FOUND)
- message(STATUS " ICE 3.5 Include directory found: ${ICE_CONFIG_INCLUDE_DIR}")
-
- # Prepare the path hint for the libraries based on the include
- # directory found.
- string(REGEX REPLACE "/include" "" ICE_PATH ${ICE_CONFIG_INCLUDE_DIR})
-
- FIND_PATH(
- ICE_INCLUDE_DIR
- NAMES IceUtil/IceUtil.h Ice/Ice.h
- NO_DEFAULT_PATH
- HINTS ${ICE_PATH}/include
- )
-
- set(ICE_LIBRARY )
-
- if(APPLE)
- set(ICE_LIB_PREFIX "Zeroc")
- else()
- set(ICE_LIB_PREFIX "")
- endif(APPLE)
-
- FIND_LIBRARY(
- ICE_ICE ${ICE_LIB_PREFIX}Ice
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICESTORM ${ICE_LIB_PREFIX}IceStorm
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICEGRID ${ICE_LIB_PREFIX}IceGrid
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICEUTIL ${ICE_LIB_PREFIX}IceUtil
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_GLACIER2 Glacier2
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
-
- FIND_LIBRARY(
- ICE_PTHREAD NAMES pthread pthread-2.13
- HINTS ${CMAKE_INSTALL_PREFIX}/lib64/ ${CMAKE_INSTALL_PREFIX}/lib/
- HINTS ${PC_ICE_LIBDIR} ${PC_ICE_LIBRARY_DIRS} /lib/i386-linux-gnu /lib/x86_64-linux-gnu /usr/lib /lib /lib64
- ENV LD_LIBRARY_PATH
- )
-
- set(ICE_FOUND FALSE)
-
- message(STATUS " libIce: ${ICE_ICE}")
- message(STATUS " libIceUtil: ${ICE_ICEUTIL}")
-
- # Make sure we have these two libs in particular
- # - me might expand this list requirement in the future
- if(ICE_ICE AND ICE_ICEUTIL)
- list(APPEND ICE_LIBRARY
- ${ICE_ICE}
- ${ICE_ICEUTIL}
- )
-
- if(CMAKE_CROSSCOMPILING)
- # When cross-compiling, we set up the environment/toolchain to put
- # the right slice2cpp/py in the path. We just need to grab that here.
- FIND_PROGRAM(ICE_SLICE2CPP slice2cpp)
- FIND_PROGRAM(ICE_SLICE2PY slice2py)
-
- # We also don't need to look for Python in this case, so just
- # force this to TRUE here.
- set(ICE_FOUND TRUE)
-
- else(CMAKE_CROSSCOMPILING)
-
- FIND_PROGRAM(ICE_SLICE2CPP slice2cpp
- HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/)
- FIND_PROGRAM(ICE_SLICE2PY slice2py
- HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/)
-
- # Check that the ICE Python package is installed
- include(GrPython)
- GR_PYTHON_CHECK_MODULE("Ice >= 3.5" Ice "Ice.stringVersion() >= '3.5.0'" PYTHON_ICE_FOUND)
- if(PYTHON_ICE_FOUND)
- set(ICE_FOUND TRUE)
- endif(PYTHON_ICE_FOUND)
- endif(CMAKE_CROSSCOMPILING)
-
- message(STATUS " SLICE2CPP: ${ICE_SLICE2CPP}")
- message(STATUS " SLICE2PY: ${ICE_SLICE2PY}")
-
- if(ICE_FOUND)
- message(STATUS "Ice-3.5 found")
-
- set(ICE_LIBRARIES ${ICE_LIBRARY})
- set(ICE_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(ICE DEFAULT_MSG ICE_LIBRARY ICE_INCLUDE_DIR)
- mark_as_advanced(ICE_INCLUDE_DIR ICE_LIBRARY)
- endif(ICE_FOUND)
- endif(ICE_ICE AND ICE_ICEUTIL)
-
-endif(NOT ICE_FOUND)
diff --git a/cmake/Modules/FindICE.cmake b/cmake/Modules/FindICE.cmake
deleted file mode 100644
index 2a65cf64da..0000000000
--- a/cmake/Modules/FindICE.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-# Override the search path for ICE; useful for manually installed libs.
-# set(ICE_MANUAL_INSTALL_PATH /opt/Ice-3.4.2/)
-
-message(STATUS "Checking for Ice-3.4")
-
-FIND_PATH(
- ICE_CONFIG_INCLUDE_DIR
- NAMES IceUtil/Config.h
- HINTS ${ICE_MANUAL_INSTALL_PATH}/include/ ${CMAKE_INSTALL_PREFIX}/include/
-)
-
-if(ICE_CONFIG_INCLUDE_DIR)
- file(STRINGS "${ICE_CONFIG_INCLUDE_DIR}/IceUtil/Config.h"
- ICE_STRING_VERSION REGEX "ICE_STRING_VERSION")
- string(REGEX MATCH "3.4" ICE_FOUND ${ICE_STRING_VERSION})
- if(ICE_FOUND)
- set(ICE_FOUND TRUE)
- endif(ICE_FOUND)
-endif(ICE_CONFIG_INCLUDE_DIR)
-
-if(NOT ICE_FOUND)
- message(STATUS " package 'Ice-3.4' not found")
-
-else(NOT ICE_FOUND)
- message(STATUS " ICE 3.4 Include directory found: ${ICE_CONFIG_INCLUDE_DIR}")
-
- # Prepare the path hint for the libraries based on the include
- # directory found.
- string(REGEX REPLACE "/include" "" ICE_PATH ${ICE_CONFIG_INCLUDE_DIR})
-
- FIND_PATH(
- ICE_INCLUDE_DIR
- NAMES IceUtil/IceUtil.h Ice/Ice.h
- NO_DEFAULT_PATH
- HINTS ${CMAKE_INSTALL_PREFIX}/include
- HINTS ${ICE_PATH}/include
- )
-
- set(ICE_LIBRARY )
-
- if(APPLE)
- set(ICE_LIB_PREFIX "Zeroc")
- else()
- set(ICE_LIB_PREFIX "")
- endif(APPLE)
-
- FIND_LIBRARY(
- ICE_ICE ${ICE_LIB_PREFIX}Ice
- HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICESTORM ${ICE_LIB_PREFIX}IceStorm
- HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICEGRID ${ICE_LIB_PREFIX}IceGrid
- HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_ICEUTIL ${ICE_LIB_PREFIX}IceUtil
- HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
- FIND_LIBRARY(
- ICE_GLACIER2 Glacier2
- HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
- HINTS ${ICE_PATH}/lib ${ICE_PATH}/lib64
- )
-
- FIND_LIBRARY(
- ICE_PTHREAD NAMES pthread pthread-2.13
- HINTS ${CMAKE_INSTALL_PREFIX}/lib64/ ${CMAKE_INSTALL_PREFIX}/lib/
- HINTS ${PC_ICE_LIBDIR} ${PC_ICE_LIBRARY_DIRS} /lib/i386-linux-gnu /lib/x86_64-linux-gnu /usr/lib /lib /lib64
- ENV LD_LIBRARY_PATH
- )
-
- set(ICE_FOUND FALSE)
-
- if(ICE_ICE AND ICE_ICEUTIL)
- list(APPEND ICE_LIBRARY
- ${ICE_ICE}
- ${ICE_ICEUTIL}
- )
-
- message(STATUS " libIce: ${ICE_ICE}")
- message(STATUS " libIceUtil: ${ICE_ICEUTIL}")
-
- FIND_PROGRAM(ICE_SLICE2CPP slice2cpp
- HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/)
- FIND_PROGRAM(ICE_SLICE2PY slice2py
- HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/)
-
- # Check that the ICE Python package is installed
- include(GrPython)
- GR_PYTHON_CHECK_MODULE("Ice >= 3.4" Ice "Ice.stringVersion() >= '3.4.0'" PYTHON_ICE_FOUND)
- if(PYTHON_ICE_FOUND)
- set(ICE_FOUND TRUE)
- endif(PYTHON_ICE_FOUND)
-
- if(ICE_FOUND)
- message(STATUS "Ice-3.4 found")
-
- if(CMAKE_COMPILER_IS_GNUCXX)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
- OUTPUT_VARIABLE gcc_version)
- string(REGEX MATCH "[0-9].[0-9].[0-9]" gcc_version_num ${gcc_version})
- if(NOT ${gcc_version_num} VERSION_LESS "4.7")
- message(STATUS "-- Found GCC version: ${gcc_version_num}")
- message(STATUS "-- GCC incompatible with Ice 3.4, disabling ControlPort")
- set(ICE_FOUND FALSE)
- return() # exit now
- endif(NOT ${gcc_version_num} VERSION_LESS "4.7")
- endif(CMAKE_COMPILER_IS_GNUCXX)
-
- set(ICE_LIBRARIES ${ICE_LIBRARY})
- set(ICE_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(ICE DEFAULT_MSG ICE_LIBRARY ICE_INCLUDE_DIR)
- mark_as_advanced(ICE_INCLUDE_DIR ICE_LIBRARY)
- endif(ICE_FOUND)
- endif(ICE_ICE AND ICE_ICEUTIL)
-
-endif(NOT ICE_FOUND)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 14:21:22 +0000