From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 19 Aug 2011 14:04:51 +0000 (+0000)
Subject: CMake: Add the same path hint for ICONV_DLL as for ICONV_DLL_HELP. Without this hint... 
X-Git-Tag: 2.1.0beta1~2816
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9ade016a901db50d0e0135deb9cae3d87e487440;p=features.git

CMake: Add the same path hint for ICONV_DLL as for ICONV_DLL_HELP. Without this hint, the former could not be found while the latter could.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39490 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index 6fb894c150..55d8fa88fd 100644
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -55,7 +55,7 @@ if(WIN32)
 	find_file(ICONV_DLL   
 					NAMES ${ICONV_DLL_NAMES}
 					PATHS ENV PATH
-					NO_DEFAULT_PATH)
+					${ICONV_INCLUDE_DIR}/../bin)
 	find_file(ICONV_DLL_HELP   
 					NAMES ${ICONV_DLL_NAMES}
 					PATHS ENV PATH