|
From: <ai...@us...> - 2013-10-14 19:17:49
|
Revision: 12598
http://sourceforge.net/p/plplot/code/12598
Author: airwin
Date: 2013-10-14 19:17:47 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
CMake's current behaviour on Windows systems is that all possible
drive letters are searched for PATHS values (e.g., /usr/bin) which do
not have a drive letter specified. The result is that with /usr/bin
in the PATHS variable, the LUA_EXECUTABLE was found corresponding to
z:/usr/bin/lua, where z: happens to be the drive letter containing a
mount of the Linux OS files on a Windows system. This unexpected
result for find, happened, for example, on Wine (which does mount all
Linux files on z:).
To work around this issue, remove all specific PATHS values when
searching for lua. The result is that lua will only be found
(both on Unix and Windows) if it is in the PATH, which is generally
the desired result.
Modified Paths:
--------------
trunk/cmake/modules/FindLua.cmake
Modified: trunk/cmake/modules/FindLua.cmake
===================================================================
--- trunk/cmake/modules/FindLua.cmake 2013-10-13 15:54:18 UTC (rev 12597)
+++ trunk/cmake/modules/FindLua.cmake 2013-10-14 19:17:47 UTC (rev 12598)
@@ -73,19 +73,9 @@
#
# * Kitware, Inc.
+# No PATHS or anything else to make sure to not find Linux version
+# on Wine.
find_program(LUA_EXECUTABLE lua
- HINTS
- $ENV{LUA_DIR}
- PATH_SUFFIXES bin
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/csw # Blastwave
- /opt
)
if(LUA_EXECUTABLE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|