upstream/oracle/userland-gate: components/cmake/patches/cmake-2.6.2.patch@5d2ca734dd20 (annotated)

312 6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1	diff -ru cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2	--- cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	3	+++ cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake Thu May 21 16:21:06 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	4	@@ -41,8 +41,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	5	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	6	/usr/lib/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	7	/usr/share/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	8	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	9	- /usr/local/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	10	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	11	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	12	+# /usr/local/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	13	/usr/java/j2sdk1.4.2_04
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	14	/usr/lib/j2sdk1.4-sun/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	15	/usr/lib/j2sdk1.5-sun/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	16	diff -ru cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake cmake-2.6.2/Modules/CMakeDetermineSystem.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	17	--- cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	18	+++ cmake-2.6.2/Modules/CMakeDetermineSystem.cmake Thu May 21 16:21:06 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	19	@@ -29,7 +29,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	20
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	21	# find out on which system cmake runs
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	22	IF(CMAKE_HOST_UNIX)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	23	- FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	24	+ FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	25	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	26	+# FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	27	IF(CMAKE_UNAME)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	28	EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	29	EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	30	diff -ru cmake-2.6.2.org//Modules/FindAVIFile.cmake cmake-2.6.2/Modules/FindAVIFile.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	31	--- cmake-2.6.2.org//Modules/FindAVIFile.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	32	+++ cmake-2.6.2/Modules/FindAVIFile.cmake Thu May 21 16:21:06 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	33	@@ -12,14 +12,16 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	34	IF (UNIX)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	35
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	36	FIND_PATH(AVIFILE_INCLUDE_DIR avifile.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	37	- /usr/local/avifile/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	38	- /usr/local/include/avifile
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	39	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	40	+# /usr/local/avifile/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	41	+# /usr/local/include/avifile
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	42	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	43	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	44
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	45	FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	46	- /usr/local/avifile/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	47	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	48	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	49	+# /usr/local/avifile/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	50	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	51	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	52	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	53
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	54	diff -ru cmake-2.6.2.org//Modules/FindBLAS.cmake cmake-2.6.2/Modules/FindBLAS.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	55	--- cmake-2.6.2.org//Modules/FindBLAS.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	56	+++ cmake-2.6.2/Modules/FindBLAS.cmake Thu May 21 16:21:06 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	57	@@ -72,7 +72,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	58	endif(BLA_STATIC)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	59	find_library(${_prefix}_${_library}_LIBRARY
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	60	NAMES ${_library}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	61	- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	62	+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV DYLD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	63	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	64	+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	65	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	66
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	67	else ( APPLE )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	68	@@ -81,7 +83,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	69	endif(BLA_STATIC)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	70	find_library(${_prefix}_${_library}_LIBRARY
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	71	NAMES ${_library}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	72	- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	73	+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	74	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	75	+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	76	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	77	endif( APPLE )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	78	mark_as_advanced(${_prefix}_${_library}_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	79	diff -ru cmake-2.6.2.org//Modules/FindFLTK.cmake cmake-2.6.2/Modules/FindFLTK.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	80	--- cmake-2.6.2.org//Modules/FindFLTK.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	81	+++ cmake-2.6.2/Modules/FindFLTK.cmake Thu May 21 16:21:06 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	82	@@ -78,11 +78,14 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	83	${FLTK_DIR_SEARCH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	84
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	85	# Look in standard UNIX install locations.
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	86	- /usr/local/lib/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	87	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	88	+# /usr/local/lib/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	89	/usr/lib/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	90	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	91	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	92	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	93	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	94	- /usr/local/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	95	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	96	+# /usr/local/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	97	/usr/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	98
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	99	# Read from the CMakeSetup registry entries. It is likely that
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	100	@@ -173,7 +176,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	101	ENDIF(FLTK_FLUID_EXECUTABLE)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	102
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	103	SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	104	- /usr/local/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	105	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	106	+# /usr/local/fltk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	107	/usr/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	108	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	109
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	110	@@ -180,7 +184,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	111	FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.h ${FLTK_INCLUDE_SEARCH_PATH})
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	112
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	113	SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	114	- /usr/local/fltk/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	115	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	116	+# /usr/local/fltk/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	117	/usr/X11R6/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	118	${FLTK_INCLUDE_DIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	119	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	120	diff -ru cmake-2.6.2.org//Modules/FindFLTK2.cmake cmake-2.6.2/Modules/FindFLTK2.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	121	--- cmake-2.6.2.org//Modules/FindFLTK2.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	122	+++ cmake-2.6.2/Modules/FindFLTK2.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	123	@@ -74,11 +74,14 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	124	${FLTK2_DIR_SEARCH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	125
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	126	# Look in standard UNIX install locations.
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	127	- /usr/local/lib/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	128	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	129	+# /usr/local/lib/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	130	/usr/lib/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	131	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	132	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	133	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	134	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	135	- /usr/local/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	136	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	137	+# /usr/local/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	138	/usr/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	139
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	140	# Read from the CMakeSetup registry entries. It is likely that
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	141	@@ -184,9 +187,11 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	142	ENDIF(FLTK2_FLUID_EXECUTABLE)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	143
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	144	SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	145	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	146	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	147	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	148	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	149	- /usr/local/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	150	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	151	+# /usr/local/fltk2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	152	/usr/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	153	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	154
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	155	@@ -194,8 +199,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	156
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	157	SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	158	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	159	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	160	- /usr/local/fltk2/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	161	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	162	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	163	+# /usr/local/fltk2/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	164	/usr/X11R6/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	165	${FLTK2_INCLUDE_DIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	166	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	167	diff -ru cmake-2.6.2.org//Modules/FindFreetype.cmake cmake-2.6.2/Modules/FindFreetype.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	168	--- cmake-2.6.2.org//Modules/FindFreetype.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	169	+++ cmake-2.6.2/Modules/FindFreetype.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	170	@@ -33,8 +33,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	171	$ENV{FREETYPE_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	172	PATH_SUFFIXES include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	173	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	174	- /usr/local/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	175	- /usr/local/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	176	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	177	+# /usr/local/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	178	+# /usr/local/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	179	/usr/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	180	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	181	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	182	@@ -45,8 +46,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	183	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	184	$ENV{FREETYPE_DIR}/include/freetype2
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	185	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	186	- /usr/local/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	187	- /usr/local/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	188	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	189	+# /usr/local/X11R6/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	190	+# /usr/local/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	191	/usr/X11/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	192	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	193	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	194	@@ -60,8 +62,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	195	$ENV{FREETYPE_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	196	PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	197	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	198	- /usr/local/X11R6
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	199	- /usr/local/X11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	200	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	201	+# /usr/local/X11R6
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	202	+# /usr/local/X11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	203	/usr/X11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	204	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	205	/usr/freeware
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	206	diff -ru cmake-2.6.2.org//Modules/FindGDAL.cmake cmake-2.6.2/Modules/FindGDAL.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	207	--- cmake-2.6.2.org//Modules/FindGDAL.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	208	+++ cmake-2.6.2/Modules/FindGDAL.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	209	@@ -26,9 +26,10 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	210	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	211	~/Library/Frameworks/gdal.framework/Headers
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	212	/Library/Frameworks/gdal.framework/Headers
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	213	- /usr/local/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	214	- /usr/local/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	215	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	216	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	217	+# /usr/local/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	218	+# /usr/local/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	219	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	220	/usr/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	221	/usr/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	222	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	223	@@ -38,9 +39,10 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	224	/opt/local/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	225	/opt/local/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	226	/opt/local/include # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	227	- /opt/csw/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	228	- /opt/csw/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	229	- /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	230	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	231	+# /opt/csw/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	232	+# /opt/csw/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	233	+# /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	234	/opt/include/gdal
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	235	/opt/include/GDAL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	236	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	237	@@ -54,11 +56,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	238	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	239	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	240	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	241	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	242	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	243	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	244	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	245	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	246	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	247	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	248	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	249	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	250	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	251	/usr/freeware
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	252	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	253	diff -ru cmake-2.6.2.org//Modules/FindGIF.cmake cmake-2.6.2/Modules/FindGIF.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	254	--- cmake-2.6.2.org//Modules/FindGIF.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	255	+++ cmake-2.6.2/Modules/FindGIF.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	256	@@ -32,11 +32,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	257	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	258	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	259	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	260	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	261	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	262	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	263	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	264	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	265	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	266	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	267	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	268	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	269	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	270	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	271	/usr/freeware
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	272	diff -ru cmake-2.6.2.org//Modules/FindGTK.cmake cmake-2.6.2/Modules/FindGTK.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	273	--- cmake-2.6.2.org//Modules/FindGTK.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	274	+++ cmake-2.6.2/Modules/FindGTK.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	275	@@ -23,9 +23,11 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	276	FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	277	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	278	/usr/openwin/share/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	279	- /usr/local/include/glib12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	280	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	281	+# /usr/local/include/glib12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	282	/usr/lib/glib/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	283	- /usr/local/lib/glib/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	284	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	285	+# /usr/local/lib/glib/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	286	/opt/gnome/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	287	/opt/gnome/lib/glib/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	288	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	289	diff -ru cmake-2.6.2.org//Modules/FindITK.cmake cmake-2.6.2/Modules/FindITK.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	290	--- cmake-2.6.2.org//Modules/FindITK.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	291	+++ cmake-2.6.2/Modules/FindITK.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	292	@@ -50,7 +50,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	293	${ITK_DIR_SEARCH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	294
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	295	# Look in standard UNIX install locations.
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	296	- /usr/local/lib/InsightToolkit
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	297	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	298	+# /usr/local/lib/InsightToolkit
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	299	/usr/lib/InsightToolkit
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	300
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	301	# Read from the CMakeSetup registry entries. It is likely that
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	302	diff -ru cmake-2.6.2.org//Modules/FindJNI.cmake cmake-2.6.2/Modules/FindJNI.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	303	--- cmake-2.6.2.org//Modules/FindJNI.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	304	+++ cmake-2.6.2/Modules/FindJNI.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	305	@@ -23,23 +23,27 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	306	$ENV{JAVA_HOME}/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	307	$ENV{JAVA_HOME}/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	308	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	309	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	310	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	311	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	312	/usr/lib/jvm/java/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	313	/usr/lib/java/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	314	- /usr/local/lib/java/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	315	- /usr/local/share/java/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	316	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	317	+# /usr/local/lib/java/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	318	+# /usr/local/share/java/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	319	/usr/lib/j2sdk1.4-sun/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	320	/usr/lib/j2sdk1.5-sun/jre/lib/i386
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	321	/opt/sun-jdk-1.5.0.04/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	322	/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	323	/usr/lib/java/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	324	- /usr/local/lib/java/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	325	- /usr/local/share/java/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	326	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	327	+# /usr/local/lib/java/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	328	+# /usr/local/share/java/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	329	/usr/lib/j2sdk1.4-sun/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	330	/usr/lib/j2sdk1.5-sun/jre/lib/amd64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	331	/usr/lib/java/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	332	- /usr/local/lib/java/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	333	- /usr/local/share/java/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	334	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	335	+# /usr/local/lib/java/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	336	+# /usr/local/share/java/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	337	/usr/lib/j2sdk1.4-sun/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	338	/usr/lib/j2sdk1.5-sun/jre/lib/ppc
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	339	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	340	@@ -61,12 +65,15 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	341	"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	342	$ENV{JAVA_HOME}/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	343	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	344	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	345	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	346	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	347	/usr/lib/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	348	- /usr/local/lib/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	349	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	350	+# /usr/local/lib/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	351	/usr/lib/jvm/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	352	/usr/lib/jvm/java-6-sun-1.6.0.00/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	353	- /usr/local/share/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	354	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	355	+# /usr/local/share/java/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	356	/usr/lib/j2sdk1.4-sun/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	357	/usr/lib/j2sdk1.5-sun/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	358	/opt/sun-jdk-1.5.0.04/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	359	diff -ru cmake-2.6.2.org//Modules/FindJava.cmake cmake-2.6.2/Modules/FindJava.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	360	--- cmake-2.6.2.org//Modules/FindJava.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	361	+++ cmake-2.6.2/Modules/FindJava.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	362	@@ -20,9 +20,10 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	363	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	364	/usr/lib/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	365	/usr/share/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	366	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	367	- /usr/local/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	368	- /usr/local/java/share/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	369	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	370	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	371	+# /usr/local/java/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	372	+# /usr/local/java/share/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	373	/usr/java/j2sdk1.4.2_04
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	374	/usr/lib/j2sdk1.4-sun/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	375	/usr/java/j2sdk1.4.2_09/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	376	diff -ru cmake-2.6.2.org//Modules/FindKDE3.cmake cmake-2.6.2/Modules/FindKDE3.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	377	--- cmake-2.6.2.org//Modules/FindKDE3.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	378	+++ cmake-2.6.2/Modules/FindKDE3.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	379	@@ -127,7 +127,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	380	/opt/kde3/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	381	/opt/kde/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	382	/usr/include/kde
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	383	- /usr/local/include/kde
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	384	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	385	+# /usr/local/include/kde
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	386	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	387
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	388	#now the KDE library directory
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	389	diff -ru cmake-2.6.2.org//Modules/FindLAPACK.cmake cmake-2.6.2/Modules/FindLAPACK.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	390	--- cmake-2.6.2.org//Modules/FindLAPACK.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	391	+++ cmake-2.6.2/Modules/FindLAPACK.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	392	@@ -80,7 +80,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	393	endif(BLA_STATIC)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	394	find_library(${_prefix}_${_library}_LIBRARY
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	395	NAMES ${_library}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	396	- PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	397	+ PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	398	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	399	+# PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	400	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	401	endif(APPLE)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	402
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	403	diff -ru cmake-2.6.2.org//Modules/FindLua50.cmake cmake-2.6.2/Modules/FindLua50.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	404	--- cmake-2.6.2.org//Modules/FindLua50.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	405	+++ cmake-2.6.2/Modules/FindLua50.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	406	@@ -19,11 +19,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	407	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	408	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	409	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	410	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	411	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	412	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	413	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	414	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	415	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	416	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	417	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	418	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	419	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	420	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	421
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	422	@@ -31,15 +33,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	423	NAMES lua50 lua5.0 lua5 lua
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	424	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	425	$ENV{LUA_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	426	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	427	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	428	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	429	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	430	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	431	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	432	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	433	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	434	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	435	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	436	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	437	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	438	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	439	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	440	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	441	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	442
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	443	@@ -55,11 +59,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	444	$ENV{LUA_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	445	PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	446	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	447	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	448	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	449	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	450	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	451	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	452	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	453	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	454	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	455	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	456	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	457	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	458	IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	459	diff -ru cmake-2.6.2.org//Modules/FindLua51.cmake cmake-2.6.2/Modules/FindLua51.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	460	--- cmake-2.6.2.org//Modules/FindLua51.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	461	+++ cmake-2.6.2/Modules/FindLua51.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	462	@@ -19,11 +19,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	463	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	464	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	465	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	466	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	467	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	468	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	469	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	470	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	471	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	472	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	473	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	474	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	475	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	476	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	477
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	478	@@ -31,15 +33,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	479	NAMES lua51 lua5.1 lua
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	480	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	481	$ENV{LUA_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	482	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	483	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	484	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	485	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	486	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	487	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	488	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	489	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	490	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	491	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	492	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	493	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	494	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	495	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	496	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	497	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	498
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	499	diff -ru cmake-2.6.2.org//Modules/FindMPI.cmake cmake-2.6.2/Modules/FindMPI.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	500	--- cmake-2.6.2.org//Modules/FindMPI.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	501	+++ cmake-2.6.2/Modules/FindMPI.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	502	@@ -243,10 +243,12 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	503	set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	504	else (MPI_COMPILE_CMDLINE)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	505	find_path(MPI_INCLUDE_PATH mpi.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	506	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	507	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	508	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	509	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	510	/usr/include/mpi
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	511	- /usr/local/mpi/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	512	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	513	+# /usr/local/mpi/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	514	"C:/Program Files/MPICH/SDK/Include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	515	"$ENV{SystemDrive}/Program Files/MPICH2/include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	516	"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	517	@@ -261,7 +263,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	518
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	519	find_library(MPI_LIBRARY
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	520	NAMES mpi mpich msmpi
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	521	- PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	522	+ PATHS /usr/lib /usr/lib/32 /usr/lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	523	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	524	+# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	525	"C:/Program Files/MPICH/SDK/Lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	526	"$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	527	"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	528	@@ -273,7 +277,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	529
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	530	find_library(MPI_EXTRA_LIBRARY
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	531	NAMES mpi++
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	532	- PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	533	+ PATHS /usr/lib /usr/lib/32 /usr/lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	534	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	535	+# PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	536	"C:/Program Files/MPICH/SDK/Lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	537	DOC "Extra MPI libraries to link against.")
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	538
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	539	diff -ru cmake-2.6.2.org//Modules/FindOpenAL.cmake cmake-2.6.2/Modules/FindOpenAL.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	540	--- cmake-2.6.2.org//Modules/FindOpenAL.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	541	+++ cmake-2.6.2/Modules/FindOpenAL.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	542	@@ -55,11 +55,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	543	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	544	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	545	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	546	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	547	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	548	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	549	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	550	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	551	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	552	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	553	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	554	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	555	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	556	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	557	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	558	@@ -68,15 +70,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	559	NAMES OpenAL al openal OpenAL32
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	560	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	561	$ENV{OPENALDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	562	- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	563	+ PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	564	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	565	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	566	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	567	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	568	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	569	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	570	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	571	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	572	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	573	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	574	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	575	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	576	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	577	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	578	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	579	diff -ru cmake-2.6.2.org//Modules/FindOpenThreads.cmake cmake-2.6.2/Modules/FindOpenThreads.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	580	--- cmake-2.6.2.org//Modules/FindOpenThreads.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	581	+++ cmake-2.6.2/Modules/FindOpenThreads.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	582	@@ -51,11 +51,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	583	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	584	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	585	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	586	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	587	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	588	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	589	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	590	/sw/include # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	591	/opt/local/include # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	592	- /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	593	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	594	+# /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	595	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	596	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	597	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	598	@@ -79,16 +81,20 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	599	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	600	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	601	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	602	- /usr/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	603	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	604	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	605	+# /usr/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	606	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	607	/usr/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	608	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	609	+ /usr/lib/32
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	610	+ /usr/lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	611	/sw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	612	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	613	/opt/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	614	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	615	- /opt/csw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	616	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	617	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	618	+# /opt/csw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	619	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	620	/opt/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	621	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	622	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	623	@@ -112,16 +118,20 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	624	$ENV{OSGDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	625	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	626	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	627	- /usr/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	628	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	629	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	630	+# /usr/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	631	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	632	/usr/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	633	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	634	+ /usr/lib/32
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	635	+ /usr/lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	636	/sw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	637	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	638	/opt/local/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	639	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	640	- /opt/csw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	641	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	642	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	643	+# /opt/csw/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	644	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	645	/opt/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	646	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	647	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	648	diff -ru cmake-2.6.2.org//Modules/FindPHP4.cmake cmake-2.6.2/Modules/FindPHP4.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	649	--- cmake-2.6.2.org//Modules/FindPHP4.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	650	+++ cmake-2.6.2/Modules/FindPHP4.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	651	@@ -9,10 +9,12 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	652
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	653	SET(PHP4_POSSIBLE_INCLUDE_PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	654	/usr/include/php4
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	655	- /usr/local/include/php4
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	656	+ /usr/php4/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	657	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	658	+# /usr/local/include/php4
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	659	/usr/include/php
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	660	- /usr/local/include/php
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	661	- /usr/local/apache/php
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	662	+# /usr/local/include/php
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	663	+# /usr/local/apache/php
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	664	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	665
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	666	SET(PHP4_POSSIBLE_LIB_PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	667	diff -ru cmake-2.6.2.org//Modules/FindPNG.cmake cmake-2.6.2/Modules/FindPNG.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	668	--- cmake-2.6.2.org//Modules/FindPNG.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	669	+++ cmake-2.6.2/Modules/FindPNG.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	670	@@ -13,7 +13,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	671
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	672	IF(ZLIB_FOUND)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	673	FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	674	- /usr/local/include/libpng # OpenBSD
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	675	+ /usr/include/libpng
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	676	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	677	+# /usr/local/include/libpng # OpenBSD
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	678	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	679
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	680	SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	681	diff -ru cmake-2.6.2.org//Modules/FindPhysFS.cmake cmake-2.6.2/Modules/FindPhysFS.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	682	--- cmake-2.6.2.org//Modules/FindPhysFS.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	683	+++ cmake-2.6.2/Modules/FindPhysFS.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	684	@@ -17,11 +17,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	685	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	686	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	687	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	688	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	689	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	690	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	691	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	692	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	693	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	694	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	695	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	696	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	697	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	698	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	699
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	700	@@ -29,15 +31,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	701	NAMES physfs
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	702	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	703	$ENV{PHYSFSDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	704	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	705	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	706	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	707	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	708	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	709	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	710	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	711	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	712	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	713	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	714	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	715	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	716	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	717	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	718	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	719	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	720
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	721	diff -ru cmake-2.6.2.org//Modules/FindPike.cmake cmake-2.6.2/Modules/FindPike.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	722	--- cmake-2.6.2.org//Modules/FindPike.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	723	+++ cmake-2.6.2/Modules/FindPike.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	724	@@ -9,7 +9,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	725
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	726	FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	727	/usr/include/pike/*
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	728	- /usr/local/include/pike/*)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	729	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	730	+# /usr/local/include/pike/*
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	731	+ )
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	732
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	733	FIND_PATH(PIKE_INCLUDE_PATH program.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	734	${PIKE_POSSIBLE_INCLUDE_PATHS})
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	735	diff -ru cmake-2.6.2.org//Modules/FindProducer.cmake cmake-2.6.2/Modules/FindProducer.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	736	--- cmake-2.6.2.org//Modules/FindProducer.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	737	+++ cmake-2.6.2/Modules/FindProducer.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	738	@@ -38,11 +38,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	739	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	740	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	741	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	742	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	743	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	744	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	745	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	746	/sw/include # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	747	/opt/local/include # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	748	- /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	749	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	750	+# /opt/csw/include # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	751	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	752	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	753	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	754	@@ -54,13 +56,15 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	755	$ENV{PRODUCER_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	756	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	757	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	758	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	759	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	760	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	761	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	762	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	763	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	764	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	765	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	766	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	767	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	768	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	769	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	770	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	771	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	772
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	773	diff -ru cmake-2.6.2.org//Modules/FindQt.cmake cmake-2.6.2/Modules/FindQt.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	774	--- cmake-2.6.2.org//Modules/FindQt.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	775	+++ cmake-2.6.2/Modules/FindQt.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	776	@@ -70,8 +70,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	777	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	778	${qt_headers}/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	779	$ENV{QTDIR}/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	780	- /usr/local/qt/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	781	- /usr/local/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	782	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	783	+# /usr/local/qt/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	784	+# /usr/local/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	785	/usr/lib/qt/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	786	/usr/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	787	/usr/share/qt4/include/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	788	@@ -89,8 +90,9 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	789	C:/Qt/3.3.3Educational/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	790	$ENV{QTDIR}/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	791	/usr/include/qt3/Qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	792	- /usr/local/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	793	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	794	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	795	+# /usr/local/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	796	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	797	/usr/lib/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	798	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	799	/usr/share/qt3/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	800	diff -ru cmake-2.6.2.org//Modules/FindQt3.cmake cmake-2.6.2/Modules/FindQt3.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	801	--- cmake-2.6.2.org//Modules/FindQt3.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	802	+++ cmake-2.6.2/Modules/FindQt3.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	803	@@ -40,7 +40,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	804	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	805	$ENV{QTDIR}/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	806	${GLOB_PATHS_BIN}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	807	- /usr/local/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	808	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	809	+# /usr/local/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	810	/usr/lib/qt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	811	/usr/lib/qt3/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	812	/usr/include/qt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	813	@@ -78,7 +79,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	814	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	815	$ENV{QTDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	816	${GLOB_PATHS_LIB}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	817	- /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	818	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	819	+# /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	820	/usr/lib/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	821	/usr/lib/qt3/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	822	/usr/lib/qt3/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	823	@@ -98,7 +100,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	824	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	825	$ENV{QTDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	826	${GLOB_PATHS_LIB}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	827	- /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	828	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	829	+# /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	830	/usr/lib/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	831	/usr/lib/qt3/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	832	/usr/lib/qt3/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	833	@@ -116,7 +119,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	834	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	835	$ENV{QTDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	836	${GLOB_PATHS_LIB}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	837	- /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	838	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	839	+# /usr/local/qt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	840	/usr/lib/qt3/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	841	/usr/lib/qt3/lib64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	842	/usr/share/qt3/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	843	@@ -134,7 +138,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	844	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	845	$ENV{QTDIR}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	846	${GLOB_PATHS_BIN}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	847	- /usr/local/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	848	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	849	+# /usr/local/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	850	/usr/lib/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	851	/usr/lib/qt3/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	852	/usr/share/qt3/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	853	@@ -155,7 +160,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	854	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	855	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	856	${GLOB_PATHS_BIN}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	857	- /usr/local/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	858	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	859	+# /usr/local/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	860	/usr/lib/qt/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	861	/usr/lib/qt3/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	862	/usr/share/qt3/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	863	diff -ru cmake-2.6.2.org//Modules/FindSDL.cmake cmake-2.6.2/Modules/FindSDL.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	864	--- cmake-2.6.2.org//Modules/FindSDL.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	865	+++ cmake-2.6.2/Modules/FindSDL.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	866	@@ -59,20 +59,23 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	867	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	868	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	869	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	870	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	871	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	872	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	873	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	874	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	875	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	876	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	877	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	878	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	879	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	880	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	881	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	882	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	883	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	884	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	885	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	886	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	887	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	888	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	889	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	890	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	891	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	892	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	893	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	894	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	895	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	896	@@ -86,11 +89,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	897	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	898	PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	899	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	900	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	901	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	902	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	903	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	904	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	905	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	906	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	907	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	908	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	909	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	910	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	911
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	912	@@ -108,11 +113,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	913	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	914	PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	915	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	916	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	917	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	918	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	919	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	920	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	921	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	922	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	923	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	924	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	925	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	926	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	927	ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	928	diff -ru cmake-2.6.2.org//Modules/FindSDL_image.cmake cmake-2.6.2/Modules/FindSDL_image.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	929	--- cmake-2.6.2.org//Modules/FindSDL_image.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	930	+++ cmake-2.6.2/Modules/FindSDL_image.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	931	@@ -20,20 +20,24 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	932	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	933	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	934	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	935	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	936	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	937	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	938	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	939	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	940	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	941	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	942	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	943	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	944	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	945	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	946	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	947	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	948	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	949	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	950	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	951	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	952	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	953	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	954	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	955	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	956	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	957	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	958	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	959	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	960	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	961	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	962	@@ -47,11 +51,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	963	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	964	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	965	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	966	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	967	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	968	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	969	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	970	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	971	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	972	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	973	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	974	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	975	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	976	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	977
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	978	diff -ru cmake-2.6.2.org//Modules/FindSDL_mixer.cmake cmake-2.6.2/Modules/FindSDL_mixer.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	979	--- cmake-2.6.2.org//Modules/FindSDL_mixer.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	980	+++ cmake-2.6.2/Modules/FindSDL_mixer.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	981	@@ -20,20 +20,24 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	982	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	983	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	984	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	985	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	986	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	987	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	988	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	989	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	990	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	991	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	992	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	993	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	994	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	995	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	996	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	997	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	998	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	999	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1000	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1001	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1002	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1003	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1004	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1005	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1006	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1007	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1008	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1009	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1010	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1011	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1012	@@ -43,15 +47,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1013	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1014	$ENV{SDLMIXERDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1015	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1016	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1017	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1018	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1019	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1020	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1021	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1022	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1023	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1024	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1025	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1026	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1027	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1028	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1029	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1030	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1031	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1032
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1033	diff -ru cmake-2.6.2.org//Modules/FindSDL_net.cmake cmake-2.6.2/Modules/FindSDL_net.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1034	--- cmake-2.6.2.org//Modules/FindSDL_net.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1035	+++ cmake-2.6.2/Modules/FindSDL_net.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1036	@@ -21,20 +21,22 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1037	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1038	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1039	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1040	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1041	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1042	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1043	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1044	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1045	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1046	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1047	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1048	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1049	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1050	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1051	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1052	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1053	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1054	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1055	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1056	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1057	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1058	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1059	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1060	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1061	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1062	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1063	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1064	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1065	@@ -43,15 +45,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1066	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1067	$ENV{SDLNETDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1068	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1069	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1070	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1071	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1072	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1073	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1074	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1075	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1076	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1077	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1078	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1079	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1080	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1081	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1082	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1083	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1084	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1085
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1086	diff -ru cmake-2.6.2.org//Modules/FindSDL_sound.cmake cmake-2.6.2/Modules/FindSDL_sound.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1087	--- cmake-2.6.2.org//Modules/FindSDL_sound.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1088	+++ cmake-2.6.2/Modules/FindSDL_sound.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1089	@@ -68,20 +68,22 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1090	$ENV{SDLDIR}/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1091	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1092	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1093	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1094	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1095	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1096	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1097	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1098	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1099	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1100	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1101	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1102	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1103	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1104	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1105	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1106	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1107	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1108	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1109	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1110	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1111	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1112	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1113	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1114	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1115	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1116	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1117	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1118	@@ -94,11 +96,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1119	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1120	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1121	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1122	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1123	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1124	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1125	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1126	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1127	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1128	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1129	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1130	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1131	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1132	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1133
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1134	@@ -211,11 +215,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1135	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1136	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1137	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1138	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1139	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1140	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1141	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1142	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1143	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1144	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1145	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1146	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1147	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1148	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1149	IF(MIKMOD_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1150	@@ -234,11 +240,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1151	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1152	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1153	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1154	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1155	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1156	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1157	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1158	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1159	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1160	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1161	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1162	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1163	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1164	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1165	IF(MODPLUG_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1166	@@ -260,11 +268,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1167	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1168	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1169	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1170	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1171	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1172	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1173	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1174	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1175	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1176	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1177	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1178	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1179	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1180	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1181	IF(VORBIS_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1182	@@ -282,11 +292,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1183	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1184	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1185	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1186	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1187	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1188	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1189	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1190	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1191	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1192	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1193	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1194	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1195	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1196	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1197	IF(OGG_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1198	@@ -306,11 +318,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1199	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1200	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1201	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1202	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1203	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1204	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1205	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1206	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1207	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1208	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1209	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1210	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1211	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1212	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1213	IF(SMPEG_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1214	@@ -330,11 +344,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1215	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1216	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1217	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1218	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1219	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1220	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1221	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1222	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1223	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1224	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1225	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1226	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1227	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1228	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1229	IF(FLAC_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1230	@@ -357,11 +373,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1231	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1232	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1233	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1234	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1235	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1236	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1237	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1238	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1239	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1240	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1241	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1242	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1243	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1244	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1245	IF(SPEEX_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1246	@@ -384,11 +402,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1247	$ENV{SDLSOUNDDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1248	$ENV{SDLDIR}/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1249	$ENV{SDLDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1250	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1251	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1252	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1253	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1254	/sw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1255	/opt/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1256	- /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1257	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1258	+# /opt/csw/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1259	/opt/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1260	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1261	IF(OGG_LIBRARY)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1262	diff -ru cmake-2.6.2.org//Modules/FindSDL_ttf.cmake cmake-2.6.2/Modules/FindSDL_ttf.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1263	--- cmake-2.6.2.org//Modules/FindSDL_ttf.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1264	+++ cmake-2.6.2/Modules/FindSDL_ttf.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1265	@@ -20,20 +20,22 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1266	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1267	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1268	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1269	- /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1270	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1271	+# /usr/local/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1272	/usr/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1273	- /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1274	- /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1275	+# /usr/local/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1276	+# /usr/local/include/SDL11 # FreeBSD ports
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1277	/usr/include/SDL12
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1278	/usr/include/SDL11
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1279	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1280	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1281	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1282	/sw/include/SDL # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1283	/sw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1284	/opt/local/include/SDL # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1285	/opt/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1286	- /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1287	- /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1288	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1289	+# /opt/csw/include/SDL # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1290	+# /opt/csw/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1291	/opt/include/SDL
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1292	/opt/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1293	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1294	@@ -46,11 +48,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1295	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1296	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1297	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1298	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1299	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1300	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1301	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1302	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1303	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1304	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1305	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1306	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1307	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1308	PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1309	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1310	diff -ru cmake-2.6.2.org//Modules/FindSelfPackers.cmake cmake-2.6.2/Modules/FindSelfPackers.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1311	--- cmake-2.6.2.org//Modules/FindSelfPackers.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1312	+++ cmake-2.6.2/Modules/FindSelfPackers.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1313	@@ -12,7 +12,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1314	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1315	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1316	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1317	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1318	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1319	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1320	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1321	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1322
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1323	@@ -21,7 +22,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1324	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1325	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1326	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1327	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1328	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1329	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1330	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1331	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1332
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1333	diff -ru cmake-2.6.2.org//Modules/FindTCL.cmake cmake-2.6.2/Modules/FindTCL.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1334	--- cmake-2.6.2.org//Modules/FindTCL.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1335	+++ cmake-2.6.2/Modules/FindTCL.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1336	@@ -66,7 +66,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1337	"${TCL_TCLSH_PATH_PARENT}/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1338	"${TK_WISH_PATH_PARENT}/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1339	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1340	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1341	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1342	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1343	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1344
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1345	IF(WIN32)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1346	@@ -146,7 +147,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1347	"${TCL_TCLSH_PATH_PARENT}/include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1348	"${TK_WISH_PATH_PARENT}/include"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1349	/usr/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1350	- /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1351	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1352	+# /usr/local/include
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1353	/usr/include/tcl${TK_LIBRARY_VERSION}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1354	/usr/include/tcl${TCL_LIBRARY_VERSION}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1355	/usr/include/tcl8.6
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1356	diff -ru cmake-2.6.2.org//Modules/FindTclStub.cmake cmake-2.6.2/Modules/FindTclStub.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1357	--- cmake-2.6.2.org//Modules/FindTclStub.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1358	+++ cmake-2.6.2/Modules/FindTclStub.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1359	@@ -53,7 +53,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1360	"${TCL_TCLSH_PATH_PARENT}/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1361	"${TK_WISH_PATH_PARENT}/lib"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1362	/usr/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1363	- /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1364	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1365	+# /usr/local/lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1366	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1367
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1368	IF(WIN32)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1369	diff -ru cmake-2.6.2.org//Modules/FindUnixCommands.cmake cmake-2.6.2/Modules/FindUnixCommands.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1370	--- cmake-2.6.2.org//Modules/FindUnixCommands.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1371	+++ cmake-2.6.2/Modules/FindUnixCommands.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1372	@@ -9,7 +9,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1373	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1374	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1375	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1376	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1377	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1378	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1379	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1380	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1381	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1382	@@ -21,7 +22,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1383	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1384	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1385	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1386	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1387	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1388	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1389	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1390	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1391	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1392	@@ -33,7 +35,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1393	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1394	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1395	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1396	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1397	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1398	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1399	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1400	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1401	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1402	@@ -45,7 +48,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1403	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1404	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1405	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1406	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1407	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1408	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1409	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1410	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1411	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1412	@@ -57,7 +61,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1413	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1414	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1415	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1416	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1417	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1418	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1419	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1420	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1421	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1422	@@ -72,7 +77,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1423	${CYGWIN_INSTALL_PATH}/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1424	/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1425	/usr/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1426	- /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1427	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1428	+# /usr/local/bin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1429	/sbin
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1430	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1431	MARK_AS_ADVANCED(
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1432	diff -ru cmake-2.6.2.org//Modules/FindVTK.cmake cmake-2.6.2/Modules/FindVTK.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1433	--- cmake-2.6.2.org//Modules/FindVTK.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1434	+++ cmake-2.6.2/Modules/FindVTK.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1435	@@ -77,7 +77,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1436	${VTK_DIR_SEARCH}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1437
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1438	# Look in standard UNIX install locations.
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1439	- /usr/local/lib/vtk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1440	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1441	+# /usr/local/lib/vtk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1442	/usr/lib/vtk
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1443
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1444	# Read from the CMakeSetup registry entries. It is likely that
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1445	diff -ru cmake-2.6.2.org//Modules/Findosg.cmake cmake-2.6.2/Modules/Findosg.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1446	--- cmake-2.6.2.org//Modules/Findosg.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1447	+++ cmake-2.6.2/Modules/Findosg.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1448	@@ -34,11 +34,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1449	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1450	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1451	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1452	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1453	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1454	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1455	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1456	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1457	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1458	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1459	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1460	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1461	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1462	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1463	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1464	@@ -49,15 +51,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1465	HINTS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1466	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1467	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1468	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1469	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1470	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1471	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1472	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1473	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1474	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1475	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1476	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1477	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1478	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1479	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1480	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1481	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1482	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1483	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1484
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1485	diff -ru cmake-2.6.2.org//Modules/FindosgDB.cmake cmake-2.6.2/Modules/FindosgDB.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1486	--- cmake-2.6.2.org//Modules/FindosgDB.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1487	+++ cmake-2.6.2/Modules/FindosgDB.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1488	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1489	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1490	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1491	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1492	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1493	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1494	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1495	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1496	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1497	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1498	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1499	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1500	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1501	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1502	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1503	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1504	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1505	$ENV{OSGDB_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1506	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1507	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1508	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1509	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1510	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1511	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1512	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1513	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1514	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1515	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1516	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1517	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1518	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1519	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1520	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1521	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1522	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1523	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1524
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1525	diff -ru cmake-2.6.2.org//Modules/FindosgFX.cmake cmake-2.6.2/Modules/FindosgFX.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1526	--- cmake-2.6.2.org//Modules/FindosgFX.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1527	+++ cmake-2.6.2/Modules/FindosgFX.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1528	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1529	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1530	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1531	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1532	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1533	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1534	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1535	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1536	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1537	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1538	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1539	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1540	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1541	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1542	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1543	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1544	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1545	$ENV{OSGFX_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1546	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1547	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1548	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1549	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1550	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1551	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1552	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1553	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1554	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1555	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1556	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1557	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1558	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1559	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1560	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1561	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1562	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1563	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1564
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1565	diff -ru cmake-2.6.2.org//Modules/FindosgGA.cmake cmake-2.6.2/Modules/FindosgGA.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1566	--- cmake-2.6.2.org//Modules/FindosgGA.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1567	+++ cmake-2.6.2/Modules/FindosgGA.cmake Thu May 21 16:21:07 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1568	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1569	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1570	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1571	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1572	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1573	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1574	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1575	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1576	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1577	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1578	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1579	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1580	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1581	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1582	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1583	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1584	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1585	$ENV{OSGGA_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1586	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1587	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1588	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1589	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1590	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1591	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1592	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1593	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1594	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1595	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1596	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1597	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1598	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1599	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1600	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1601	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1602	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1603	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1604
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1605	diff -ru cmake-2.6.2.org//Modules/FindosgIntrospection.cmake cmake-2.6.2/Modules/FindosgIntrospection.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1606	--- cmake-2.6.2.org//Modules/FindosgIntrospection.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1607	+++ cmake-2.6.2/Modules/FindosgIntrospection.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1608	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1609	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1610	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1611	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1612	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1613	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1614	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1615	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1616	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1617	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1618	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1619	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1620	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1621	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1622	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1623	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1624	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1625	$ENV{OSGINTROSPECTION_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1626	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1627	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1628	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1629	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1630	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1631	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1632	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1633	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1634	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1635	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1636	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1637	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1638	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1639	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1640	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1641	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1642	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1643	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1644
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1645	diff -ru cmake-2.6.2.org//Modules/FindosgManipulator.cmake cmake-2.6.2/Modules/FindosgManipulator.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1646	--- cmake-2.6.2.org//Modules/FindosgManipulator.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1647	+++ cmake-2.6.2/Modules/FindosgManipulator.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1648	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1649	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1650	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1651	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1652	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1653	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1654	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1655	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1656	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1657	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1658	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1659	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1660	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1661	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1662	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1663	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1664	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1665	$ENV{OSGMANIPULATOR_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1666	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1667	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1668	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1669	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1670	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1671	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1672	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1673	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1674	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1675	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1676	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1677	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1678	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1679	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1680	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1681	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1682	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1683	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1684
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1685	diff -ru cmake-2.6.2.org//Modules/FindosgParticle.cmake cmake-2.6.2/Modules/FindosgParticle.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1686	--- cmake-2.6.2.org//Modules/FindosgParticle.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1687	+++ cmake-2.6.2/Modules/FindosgParticle.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1688	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1689	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1690	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1691	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1692	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1693	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1694	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1695	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1696	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1697	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1698	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1699	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1700	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1701	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1702	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1703	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1704	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1705	$ENV{OSGPARTICLE_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1706	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1707	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1708	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1709	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1710	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1711	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1712	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1713	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1714	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1715	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1716	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1717	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1718	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1719	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1720	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1721	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1722	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1723	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1724
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1725	diff -ru cmake-2.6.2.org//Modules/FindosgProducer.cmake cmake-2.6.2/Modules/FindosgProducer.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1726	--- cmake-2.6.2.org//Modules/FindosgProducer.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1727	+++ cmake-2.6.2/Modules/FindosgProducer.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1728	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1729	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1730	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1731	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1732	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1733	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1734	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1735	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1736	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1737	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1738	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1739	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1740	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1741	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1742	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1743	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1744	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1745	$ENV{OSGPRODUCER_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1746	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1747	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1748	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1749	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1750	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1751	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1752	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1753	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1754	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1755	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1756	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1757	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1758	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1759	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1760	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1761	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1762	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1763	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1764
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1765	diff -ru cmake-2.6.2.org//Modules/FindosgShadow.cmake cmake-2.6.2/Modules/FindosgShadow.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1766	--- cmake-2.6.2.org//Modules/FindosgShadow.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1767	+++ cmake-2.6.2/Modules/FindosgShadow.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1768	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1769	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1770	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1771	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1772	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1773	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1774	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1775	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1776	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1777	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1778	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1779	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1780	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1781	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1782	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1783	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1784	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1785	$ENV{OSGSHADOW_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1786	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1787	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1788	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1789	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1790	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1791	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1792	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1793	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1794	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1795	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1796	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1797	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1798	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1799	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1800	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1801	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1802	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1803	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1804
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1805	diff -ru cmake-2.6.2.org//Modules/FindosgSim.cmake cmake-2.6.2/Modules/FindosgSim.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1806	--- cmake-2.6.2.org//Modules/FindosgSim.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1807	+++ cmake-2.6.2/Modules/FindosgSim.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1808	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1809	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1810	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1811	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1812	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1813	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1814	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1815	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1816	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1817	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1818	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1819	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1820	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1821	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1822	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1823	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1824	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1825	$ENV{OSGSIM_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1826	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1827	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1828	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1829	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1830	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1831	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1832	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1833	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1834	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1835	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1836	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1837	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1838	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1839	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1840	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1841	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1842	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1843	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1844
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1845	diff -ru cmake-2.6.2.org//Modules/FindosgTerrain.cmake cmake-2.6.2/Modules/FindosgTerrain.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1846	--- cmake-2.6.2.org//Modules/FindosgTerrain.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1847	+++ cmake-2.6.2/Modules/FindosgTerrain.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1848	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1849	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1850	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1851	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1852	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1853	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1854	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1855	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1856	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1857	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1858	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1859	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1860	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1861	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1862	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1863	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1864	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1865	$ENV{OSGTERRAIN_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1866	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1867	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1868	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1869	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1870	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1871	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1872	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1873	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1874	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1875	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1876	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1877	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1878	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1879	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1880	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1881	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1882	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1883	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1884
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1885	diff -ru cmake-2.6.2.org//Modules/FindosgText.cmake cmake-2.6.2/Modules/FindosgText.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1886	--- cmake-2.6.2.org//Modules/FindosgText.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1887	+++ cmake-2.6.2/Modules/FindosgText.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1888	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1889	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1890	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1891	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1892	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1893	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1894	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1895	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1896	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1897	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1898	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1899	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1900	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1901	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1902	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1903	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1904	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1905	$ENV{OSGTEXT_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1906	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1907	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1908	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1909	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1910	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1911	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1912	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1913	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1914	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1915	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1916	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1917	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1918	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1919	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1920	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1921	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1922	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1923	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1924
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1925	diff -ru cmake-2.6.2.org//Modules/FindosgUtil.cmake cmake-2.6.2/Modules/FindosgUtil.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1926	--- cmake-2.6.2.org//Modules/FindosgUtil.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1927	+++ cmake-2.6.2/Modules/FindosgUtil.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1928	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1929	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1930	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1931	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1932	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1933	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1934	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1935	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1936	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1937	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1938	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1939	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1940	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1941	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1942	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1943	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1944	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1945	$ENV{OSGUTIL_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1946	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1947	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1948	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1949	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1950	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1951	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1952	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1953	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1954	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1955	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1956	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1957	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1958	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1959	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1960	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1961	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1962	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1963	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1964
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1965	diff -ru cmake-2.6.2.org//Modules/FindosgViewer.cmake cmake-2.6.2/Modules/FindosgViewer.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1966	--- cmake-2.6.2.org//Modules/FindosgViewer.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1967	+++ cmake-2.6.2/Modules/FindosgViewer.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1968	@@ -35,11 +35,13 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1969	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1970	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1971	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1972	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1973	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1974	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1975	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1976	/sw # Fink
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1977	/opt/local # DarwinPorts
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1978	- /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1979	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1980	+# /opt/csw # Blastwave
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1981	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1982	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1983	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1984	@@ -51,15 +53,17 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1985	$ENV{OSGVIEWER_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1986	$ENV{OSG_DIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1987	$ENV{OSGDIR}
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1988	- PATH_SUFFIXES lib64 lib
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1989	+ PATH_SUFFIXES lib64 lib lib/32 lib/64
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1990	PATHS
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1991	~/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1992	/Library/Frameworks
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1993	- /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1994	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1995	+# /usr/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1996	/usr
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1997	/sw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1998	/opt/local
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	1999	- /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2000	+# Uncomment the following to enable /opt/csw search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2001	+# /opt/csw
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2002	/opt
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2003	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2004
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2005	diff -ru cmake-2.6.2.org//Modules/GetPrerequisites.cmake cmake-2.6.2/Modules/GetPrerequisites.cmake
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2006	--- cmake-2.6.2.org//Modules/GetPrerequisites.cmake Wed Sep 24 11:34:34 2008
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2007	+++ cmake-2.6.2/Modules/GetPrerequisites.cmake Thu May 21 16:21:08 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2008	@@ -440,7 +440,8 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2009	"C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2010	"C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2011	"C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2012	- "/usr/local/bin"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2013	+# Uncomment the following to enable /usr/local search
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2014	+# "/usr/local/bin"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2015	"/usr/bin"
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2016	)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2017
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2018	diff -ru cmake-2.6.2.org//Source/cmDocumentation.cxx cmake-2.6.2/Source/cmDocumentation.cxx
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2019	--- cmake-2.6.2.org//Source/cmDocumentation.cxx Wed Apr 15 20:35:21 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2020	+++ cmake-2.6.2/Source/cmDocumentation.cxx Thu May 21 16:14:19 2009
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2021	@@ -1222,6 +1222,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2022	bool cmDocumentation::PrintDocumentationUsage(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2023	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2024	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2025	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2026	this->AddSectionToPrint("Usage");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2027	this->AddSectionToPrint("Options");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2028	this->AddSectionToPrint("Generators");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2029	@@ -1244,6 +1245,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2030	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2031	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2032	this->CreateModulesSection();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2033	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2034	this->AddSectionToPrint("Description");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2035	this->AddSectionToPrint("Modules");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2036	this->AddSectionToPrint("Copyright");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2037	@@ -1259,6 +1261,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2038	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2039	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2040	this->CreateCustomModulesSection();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2041	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2042	this->AddSectionToPrint("Description");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2043	this->AddSectionToPrint("Custom CMake Modules");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2044	// the custom modules are most probably not under Kitware's copyright, Alex
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2045	@@ -1275,6 +1278,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2046	bool cmDocumentation::PrintDocumentationPolicies(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2047	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2048	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2049	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2050	this->AddSectionToPrint("Description");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2051	this->AddSectionToPrint("Policies");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2052	this->AddSectionToPrint("Copyright");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2053	@@ -1290,6 +1294,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2054	bool cmDocumentation::PrintDocumentationProperties(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2055	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2056	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2057	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2058	this->AddSectionToPrint("Properties Description");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2059	for (std::vector<std::string>::iterator i =
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2060	this->PropertySections.begin();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2061	@@ -1309,6 +1314,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2062	bool cmDocumentation::PrintDocumentationVariables(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2063	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2064	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2065	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2066	for (std::vector<std::string>::iterator i =
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2067	this->VariableSections.begin();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2068	i != this->VariableSections.end(); ++i)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2069	@@ -1327,6 +1333,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2070	bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2071	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2072	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2073	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2074	this->AddSectionToPrint("Commands");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2075	this->AddSectionToPrint("Copyright");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2076	this->AddSectionToPrint("Standard See Also");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2077	@@ -1340,6 +1347,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2078	bool cmDocumentation::PrintDocumentationCompatCommands(std::ostream& os)
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2079	{
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2080	this->ClearSections();
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2081	+ this->AddSectionToPrint("Name");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2082	this->AddSectionToPrint("Compatibility Commands Description");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2083	this->AddSectionToPrint("Compatibility Commands");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2084	this->AddSectionToPrint("Copyright");
6ca02fd5a199 7053567 Move cmake from SFW to Userland April Chin <april.chin@oracle.com> parents: diff changeset	2085	diff -ru cmake-2.6.2.org//Source/cmGlobalGenerator.cxx cmake-2.6.2/Source/cmGlobalGenerator.cxx

author	April Chin <april.chin@oracle.com>
	Fri, 08 Jul 2011 13:30:02 -0700
changeset 382	5d2ca734dd20
parent 312	6ca02fd5a199
permissions	-rw-r--r--