diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-11-26 08:56:26 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-11-26 08:56:26 -0500 |
| commit | d634ef144e8bade8f3c96678b10d7f05bc968eb2 (patch) | |
| tree | 0f15b0d84a8fa7f6e0bb4bd68689abbdd95b7828 | |
| parent | fa3187a1c03f87d944c261c764f61453d77d8244 (diff) | |
| parent | a04bb11b52ed1bc122af22b65fbdebf3afb6eb55 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/FindICE-3.5.cmake | 1 | ||||
| -rw-r--r-- | cmake/Modules/FindICE.cmake | 1 |
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) |