Attachment #309779 for bug #412925

Line Link Here

(-)file_not_specified_in_diff (-5 / +9 lines)
0	-- cmake-2.8.8/Modules/Platform/Darwin.cmake	0	++ cmake-2.8.8/Modules/Platform/Darwin.cmake
Lines 229-248 Link Here
229		229
230		230
231		231
232	# default to searching for frameworks first	232	# default to searching for frameworks last
233	SET(CMAKE_FIND_FRAMEWORK FIRST)	233	SET(CMAKE_FIND_FRAMEWORK LAST)
234	# set up the default search directories for frameworks	234	# set up the default search directories for frameworks
235	SET(CMAKE_SYSTEM_FRAMEWORK_PATH	235	SET(CMAKE_SYSTEM_FRAMEWORK_PATH
		236	@GENTOO_PORTAGE_EPREFIX@Frameworks
		237	@GENTOO_PORTAGE_EPREFIX@usr/lib
236	~/Library/Frameworks	238	~/Library/Frameworks
237	/Library/Frameworks	239	/Library/Frameworks
238	/Network/Library/Frameworks	240	/Network/Library/Frameworks
239	/System/Library/Frameworks)	241	/System/Library/Frameworks)
240		242
241	# default to searching for application bundles first	243	# default to searching for application bundles last
242	SET(CMAKE_FIND_APPBUNDLE FIRST)	244	SET(CMAKE_FIND_APPBUNDLE LAST)
243	# set up the default search directories for application bundles	245	# set up the default search directories for application bundles
244	SET(_apps_paths)	246	SET(_apps_paths)
245	FOREACH(_path	247	FOREACH(_path
		248	@GENTOO_PORTAGE_EPREFIX@Applications
		249	@GENTOO_PORTAGE_EPREFIX@usr/bin
246	"~/Applications"	250	"~/Applications"
247	"/Applications"	251	"/Applications"
248	"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+	252	"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+




# 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 412925

Lines 33-38 Link Here

(-)cmake-2.8.8.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