summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim O'Shea <tim.oshea753@gmail.com>2013-11-26 08:31:52 -0500
committerTom Rondeau <tom@trondeau.com>2013-11-26 08:55:39 -0500
commita04bb11b52ed1bc122af22b65fbdebf3afb6eb55 (patch)
tree663bb42212fd67f4a7b49423231434def93e1a7b
parent86a0c3c25f4ccbe6c07294221fec20f4682401de (diff)
cmake: ensure GrPython is included before using methods from it in FindICE.cmake - needed when including only FindICE from OOT modules
-rw-r--r--cmake/Modules/FindICE-3.5.cmake1
-rw-r--r--cmake/Modules/FindICE.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/Modules/FindICE-3.5.cmake b/cmake/Modules/FindICE-3.5.cmake
index dff1967e07..6d783a9bd4 100644
--- a/cmake/Modules/FindICE-3.5.cmake
+++ b/cmake/Modules/FindICE-3.5.cmake
@@ -96,6 +96,7 @@ if(ICE_ICE AND ICE_ICEUTIL)
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)
diff --git a/cmake/Modules/FindICE.cmake b/cmake/Modules/FindICE.cmake
index 6700828127..c1d18dffa1 100644
--- a/cmake/Modules/FindICE.cmake
+++ b/cmake/Modules/FindICE.cmake
@@ -97,6 +97,7 @@ if(ICE_ICE AND ICE_ICEUTIL)
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)