cf5859bc54
* When processing DartMeasurements use the tests working directory. * ExternalProject: No svn --username if empty. * Avoid problem reading jni.h on Macs. * Fixed appending PATH to dumpbin tool from growing without bounds. * Switch to CMAKE_PATH when doing PATH comparisons on Windows. * Remove unecessary TO_CMAKE_PATH for gp_cmd_dir. * Append the gp_tool path to the system PATH using native slashes. * Fixes to GetPrerequisites for cygwin. * CPackDeb Added several optional debian binary package fields. * ENH: Added case for Python 2.7. * Fixed parallel build for generators with EXTRA.
22 lines
581 B
Text
22 lines
581 B
Text
$NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $
|
|
|
|
--- Modules/Platform/UnixPaths.cmake.orig 2010-11-03 19:58:27.000000000 +0000
|
|
+++ Modules/Platform/UnixPaths.cmake
|
|
@@ -48,7 +48,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
|
/usr/include/w32api
|
|
|
|
# X11
|
|
- /usr/X11R6/include /usr/include/X11
|
|
+ @X11BASE@/include /usr/X11R6/include /usr/include/X11
|
|
|
|
# Other
|
|
/usr/pkg/include
|
|
@@ -61,7 +61,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
|
/usr/lib/w32api
|
|
|
|
# X11
|
|
- /usr/X11R6/lib /usr/lib/X11
|
|
+ @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
|
|
|
|
# Other
|
|
/usr/pkg/lib
|