Attachment #253275 for bug #344259

Line Link Here

(-)file_not_specified_in_diff (-5 / +9 lines)
0	-- cmake-2.8.3/Modules/Platform/Darwin.cmake	0	++ cmake-2.8.3/Modules/Platform/Darwin.cmake
Lines 217-235 Link Here
217		217
218		218
219		219
220	# default to searching for frameworks first	220	# default to searching for frameworks last
221	SET(CMAKE_FIND_FRAMEWORK FIRST)	221	SET(CMAKE_FIND_FRAMEWORK LAST)
222	# set up the default search directories for frameworks	222	# set up the default search directories for frameworks
223	SET(CMAKE_SYSTEM_FRAMEWORK_PATH	223	SET(CMAKE_SYSTEM_FRAMEWORK_PATH
		224	@GENTOO_PORTAGE_EPREFIX@Frameworks
		225	@GENTOO_PORTAGE_EPREFIX@usr/lib
224	~/Library/Frameworks	226	~/Library/Frameworks
225	/Library/Frameworks	227	/Library/Frameworks
226	/Network/Library/Frameworks	228	/Network/Library/Frameworks
227	/System/Library/Frameworks)	229	/System/Library/Frameworks)
228		230
229	# default to searching for application bundles first	231	# default to searching for application bundles last
230	SET(CMAKE_FIND_APPBUNDLE FIRST)	232	SET(CMAKE_FIND_APPBUNDLE LAST)
231	# set up the default search directories for application bundles	233	# set up the default search directories for application bundles
232	SET(CMAKE_SYSTEM_APPBUNDLE_PATH	234	SET(CMAKE_SYSTEM_APPBUNDLE_PATH
		235	@GENTOO_PORTAGE_EPREFIX@Applications
		236	@GENTOO_PORTAGE_EPREFIX@usr/bin
233	~/Applications	237	~/Applications
234	/Applications	238	/Applications
235	/Developer/Applications)	239	/Developer/Applications)




# search types.
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
  # Standard
  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
  /usr/local /usr /

  # CMake install location


# List common include file locations not under the common prefixes.
LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
  @GENTOO_PORTAGE_EPREFIX@usr/include
  /usr/include/w32api

  # X11
  /usr/X11R6/include /usr/include/X11

  # Other
  /usr/pkg/include
  /opt/csw/include /opt/include  
  /usr/openwin/include
  )

LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
  @GENTOO_PORTAGE_GCCLIBDIR@
  @GENTOO_PORTAGE_EPREFIX@usr/lib64
  @GENTOO_PORTAGE_EPREFIX@usr/lib32
  @GENTOO_PORTAGE_EPREFIX@usr/lib
  @GENTOO_PORTAGE_EPREFIX@lib
  # Other
  /usr/pkg/lib
  /opt/csw/lib /opt/lib 
  /usr/openwin/lib
  )

LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
  @GENTOO_PORTAGE_EPREFIX@usr/bin
  @GENTOO_PORTAGE_EPREFIX@bin
  )

LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
  @GENTOO_PORTAGE_GCCLIBDIR@
  @GENTOO_PORTAGE_EPREFIX@usr/lib64
  @GENTOO_PORTAGE_EPREFIX@usr/lib32
  @GENTOO_PORTAGE_EPREFIX@usr/lib
  @GENTOO_PORTAGE_EPREFIX@lib
  /lib /usr/lib /usr/lib32 /usr/lib64
  )

LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
  @GENTOO_PORTAGE_EPREFIX@usr/include
  /usr/include
  )
LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
  @GENTOO_PORTAGE_EPREFIX@usr/include
  /usr/include
  )


Return to bug 344259

Lines 33-38 Link Here

(-)cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake (-21 / +18 lines)
33	# search types.	33	# search types.
34	LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH	34	LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
35	# Standard	35	# Standard
		36	@GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
36	/usr/local /usr /	37	/usr/local /usr /
37		38
38	# CMake install location	39	# CMake install location
Lines 44-86 Link Here
44		45
45	# List common include file locations not under the common prefixes.	46	# List common include file locations not under the common prefixes.
46	LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH	47	LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
47	# Windows API on Cygwin	48	@GENTOO_PORTAGE_EPREFIX@usr/include
48	/usr/include/w32api
49
50	# X11
51	/usr/X11R6/include /usr/include/X11
52
53	# Other
54	/usr/pkg/include
55	/opt/csw/include /opt/include
56	/usr/openwin/include
57	)	49	)
58		50
59	LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH	51	LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
60	# Windows API on Cygwin	52	@GENTOO_PORTAGE_GCCLIBDIR@/gcc
61	/usr/lib/w32api	53	@GENTOO_PORTAGE_GCCLIBDIR@
62		54	@GENTOO_PORTAGE_EPREFIX@usr/lib64
63	# X11	55	@GENTOO_PORTAGE_EPREFIX@usr/lib32
64	/usr/X11R6/lib /usr/lib/X11	56	@GENTOO_PORTAGE_EPREFIX@usr/lib
65		57	@GENTOO_PORTAGE_EPREFIX@lib
66	# Other
67	/usr/pkg/lib
68	/opt/csw/lib /opt/lib
69	/usr/openwin/lib
70	)	58	)
71		59
72	LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH	60	LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
73	/usr/pkg/bin	61	@GENTOO_PORTAGE_EPREFIX@usr/bin
		62	@GENTOO_PORTAGE_EPREFIX@bin
74	)	63	)
75		64
76	LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES	65	LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
		66	@GENTOO_PORTAGE_GCCLIBDIR@/gcc
		67	@GENTOO_PORTAGE_GCCLIBDIR@
		68	@GENTOO_PORTAGE_EPREFIX@usr/lib64
		69	@GENTOO_PORTAGE_EPREFIX@usr/lib32
		70	@GENTOO_PORTAGE_EPREFIX@usr/lib
		71	@GENTOO_PORTAGE_EPREFIX@lib
77	/lib /usr/lib /usr/lib32 /usr/lib64	72	/lib /usr/lib /usr/lib32 /usr/lib64
78	)	73	)
79		74
80	LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES	75	LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
		76	@GENTOO_PORTAGE_EPREFIX@usr/include
81	/usr/include	77	/usr/include
82	)	78	)
83	LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES	79	LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
		80	@GENTOO_PORTAGE_EPREFIX@usr/include
84	/usr/include	81	/usr/include
85	)	82	)
86		83