This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b44bf8890f8128b26184cfdf5de58aae13c8157b (commit) via d5047ca1b298a52c605be5f05a6458c8147872ae (commit) from df87e21c08e3845db5783d17b1a27a3e170738cd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b44bf8890f8128b26184cfdf5de58aae13c8157b commit b44bf8890f8128b26184cfdf5de58aae13c8157b Merge: df87e21 d5047ca Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Sep 9 11:48:37 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Sep 9 11:48:37 2014 -0400 Merge topic 'FindIce-drop-unnecessary-code' into next d5047ca1 FindIce: Remove unneeded search path modification http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5047ca1b298a52c605be5f05a6458c8147872ae commit d5047ca1b298a52c605be5f05a6458c8147872ae Author: Roger Leigh <r.le...@dundee.ac.uk> AuthorDate: Tue Sep 9 16:28:11 2014 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Sep 9 11:45:51 2014 -0400 FindIce: Remove unneeded search path modification Drop code adding redundant "/opt/Ice-${ice_version}" paths. 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" ----------------------------------------------------------------------- Summary of changes: Modules/FindIce.cmake | 7 ------- 1 file changed, 7 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits