Hi,
I have attached a minor fix to the FindIce module added a couple of
weeks back. This can override the user's intended search path and
was made unnecessary by the changes you requested prior to merging
(the paths being added are already added as fallbacks via the
list(APPEND ice_roots "/opt/Ice-${ice_version}")
line earlier in the script), so the removal simply makes the
behaviour consistent.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' schroot and sbuild http://alioth.debian.org/projects/buildd-tools
`- GPG Public Key F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800
>From e73f31183fb392769091877ee8aedffbe7de2f88 Mon Sep 17 00:00:00 2001
From: Roger Leigh <[email protected]>
Date: Tue, 9 Sep 2014 16:28:11 +0100
Subject: [PATCH] FindIce: Remove unneeded search path modification
---
Modules/FindIce.cmake | 7 -------
1 file changed, 7 deletions(-)
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index c437a40..50bc60e 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -242,13 +242,6 @@ function(_Ice_FIND)
message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
- # The following searches prefer the version found; note reverse
- # order due to prepending.
- if(NOT MSVC)
- list(INSERT ice_roots 0 "/opt/Ice-${Ice_VERSION_SLICE2CPP_SHORT}")
- list(INSERT ice_roots 0 "/opt/Ice-${Ice_VERSION_SLICE2CPP_FULL}")
- endif()
-
# Find include directory
find_path(Ice_INCLUDE_DIR
NAMES "Ice/Ice.h"
--
1.9.1
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
