View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

darwin.patch [^] (511 bytes) 2012-03-26 06:10 [Show Content] [Hide Content]

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index c4b5635..311b88b 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -242,10 +242,11 @@ SET(CMAKE_FIND_APPBUNDLE FIRST)
 SET(CMAKE_SYSTEM_APPBUNDLE_PATH
   ~/Applications
   /Applications
-  /Developer/Applications)
+  ${OSX_DEVELOPER_ROOT}/Applications)
 
 INCLUDE(Platform/UnixPaths)
 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
   /sw        # Fink
   /opt/local # MacPorts
+  /usr/local # Homebrew
   )

Relationships

related to

0012621

closed

David Cole

Compatibility with Xcode 4.3

Notes
(0028970) Brad King (manager) 2012-03-26 09:46	Thanks. I applied the OSX_DEVELOPER_ROOT hunk from the patch: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98b9a7f6 [^] Platform/UnixPaths already adds /usr/local as the first path in CMAKE_SYSTEM_PREFIX_PATH so the latter hunk should not be needed.

(0028982) David Cole (manager) 2012-03-27 14:56	Except... On a machine with Xcode 4.3 installed, there is no "Applications" folder inside Developer anymore: $ ls /Applications/Xcode.app/Contents/Developer/ Documentation Library Platforms Tools Headers Makefiles Toolchains usr ...but there is one as a sibling of Developer: $ ls /Applications/Xcode.app/Contents/ Applications Frameworks MacOS PlugIns _CodeSignature CodeResources Info.plist OtherFrameworks Resources _MASReceipt Developer Library PkgInfo SharedFrameworks version.plist So that's the one that should be searched, and it is not under OSX_DEVELOPER_ROOT. I'm afraid the patch should use the Developer root variable if there is an Applications folder in there, but use the sibling if it exists...

(0029090) David Cole (manager) 2012-04-06 11:28	Added this commit to address my concerns raised in the previous note: http://public.kitware.com/gitweb?p=cmake.git;a=commitdiff;h=d9edf46760a39d230836a7b99fb4ac33d466c337 [^]

(0030854) David Cole (manager) 2012-09-03 16:01	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2012-03-26 06:10	Kashif Rasul	New Issue
2012-03-26 06:10	Kashif Rasul	File Added: darwin.patch
2012-03-26 09:20	Brad King	Relationship added	related to 0012621
2012-03-26 09:46	Brad King	Note Added: 0028970
2012-03-26 09:46	Brad King	Status	new => resolved
2012-03-26 09:46	Brad King	Resolution	open => fixed
2012-03-26 09:46	Brad King	Assigned To	=> Brad King
2012-03-27 14:56	David Cole	Note Added: 0028982
2012-03-27 14:56	David Cole	Status	resolved => feedback
2012-03-27 14:56	David Cole	Resolution	fixed => reopened
2012-03-27 15:13	Brad King	Assigned To	Brad King => David Cole
2012-03-27 15:13	Brad King	Status	feedback => assigned
2012-04-06 11:28	David Cole	Note Added: 0029090
2012-04-10 15:26	David Cole	Fixed in Version	=> CMake 2.8.8
2012-04-10 15:26	David Cole	Target Version	=> CMake 2.8.8
2012-04-18 13:03	David Cole	Status	assigned => resolved
2012-04-18 13:03	David Cole	Resolution	reopened => fixed
2012-09-03 16:01	David Cole	Note Added: 0030854
2012-09-03 16:01	David Cole	Status	resolved => closed