Revision: 44761
http://brlcad.svn.sourceforge.net/brlcad/?rev=44761&view=rev
Author: starseeker
Date: 2011-06-06 21:21:25 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Go with KDE style lookup for Carbon and Cocoa - much simpler.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/misc/CMake/FindCarbon.cmake
brlcad/trunk/misc/CMake/FindCocoa.cmake
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-06-06 21:20:18 UTC (rev 44760)
+++ brlcad/trunk/CMakeLists.txt 2011-06-06 21:21:25 UTC (rev 44761)
@@ -815,7 +815,7 @@
# While the primary purpose of this section is to identify libraries,
# some of the headers we are looking for are associated with the
-# libraries checked here. In those cases, we will hand the header
+# libraries checked here. In those cases, we will handle the header
# logic here as opposed to separating the header logic from the
# find_package call.
@@ -834,10 +834,17 @@
# Check for CoreFoundation, Carbon and Cocoa on Apple
IF(APPLE)
- find_library(COREFOUNDATION_FRAMEWORK CoreFoundation)
- INCLUDE(${BRLCAD_CMAKE_DIR}/FindCarbon.cmake)
- INCLUDE(${BRLCAD_CMAKE_DIR}/FindCocoa.cmake)
+ INCLUDE(CMakeFindFrameworks)
+ FIND_LIBRARY(COREFOUNDATION_FRAMEWORK CoreFoundation)
+ CMAKE_FIND_FRAMEWORKS(Carbon)
+ IF(Carbon_FRAMEWORKS)
+ SET(Carbon_LIBRARIES "-framework Carbon" CACHE FILEPATH "Carbon
framework" FORCE)
+ ENDIF(Carbon_FRAMEWORKS)
BRLCAD_INCLUDE_FILE(Carbon/Carbon.h HAVE_CARBON_CARBON_H)
+ CMAKE_FIND_FRAMEWORKS(Cocoa)
+ IF(Cocoa_FRAMEWORKS)
+ SET(Cocoa_LIBRARIES "-framework Cocoa" CACHE FILEPATH "Cocoa
framework" FORCE)
+ ENDIF(Cocoa_FRAMEWORKS)
ENDIF(APPLE)
# crypt library (needed on some platforms for enigma)
Deleted: brlcad/trunk/misc/CMake/FindCarbon.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindCarbon.cmake 2011-06-06 21:20:18 UTC (rev
44760)
+++ brlcad/trunk/misc/CMake/FindCarbon.cmake 2011-06-06 21:21:25 UTC (rev
44761)
@@ -1,46 +0,0 @@
-#-------------------------------------------------------------------
-# This file is from the CMake build system for OGRE
-# (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-# - Try to find Carbon
-# Once done, this will define
-#
-# Carbon_FOUND - system has Carbon
-# Carbon_INCLUDE_DIRS - the Carbon include directories
-# Carbon_LIBRARIES - link these to use Carbon
-
-include(FindPkgMacros)
-findpkg_begin(Carbon)
-
-# construct search paths
-set(Carbon_PREFIX_PATH ${Carbon_HOME} $ENV{Carbon_HOME})
-create_search_paths(Carbon)
-# redo search if prefix path changed
-clear_if_changed(Carbon_PREFIX_PATH
- Carbon_LIBRARY_FWK
- Carbon_LIBRARY_REL
- Carbon_LIBRARY_DBG
- Carbon_INCLUDE_DIR
-)
-
-set(Carbon_LIBRARY_NAMES Carbon)
-get_debug_names(Carbon_LIBRARY_NAMES)
-
-use_pkgconfig(Carbon_PKGC Carbon)
-
-findpkg_framework(Carbon)
-
-find_path(Carbon_INCLUDE_DIR NAMES Carbon.h HINTS ${Carbon_INC_SEARCH_PATH}
${Carbon_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Carbon)
-find_library(Carbon_LIBRARY_REL NAMES ${Carbon_LIBRARY_NAMES} HINTS
${Carbon_LIB_SEARCH_PATH} ${Carbon_PKGC_LIBRARY_DIRS})
-find_library(Carbon_LIBRARY_DBG NAMES ${Carbon_LIBRARY_NAMES_DBG} HINTS
${Carbon_LIB_SEARCH_PATH} ${Carbon_PKGC_LIBRARY_DIRS})
-make_library_set(Carbon_LIBRARY)
-
-findpkg_finish(Carbon)
-add_parent_dir(Carbon_INCLUDE_DIRS Carbon_INCLUDE_DIR)
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Carbon DEFAULT_MSG Carbon_LIBRARIES
Carbon_INCLUDE_DIRS)
Deleted: brlcad/trunk/misc/CMake/FindCocoa.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindCocoa.cmake 2011-06-06 21:20:18 UTC (rev
44760)
+++ brlcad/trunk/misc/CMake/FindCocoa.cmake 2011-06-06 21:21:25 UTC (rev
44761)
@@ -1,47 +0,0 @@
-#-------------------------------------------------------------------
-# This file is part of the CMake build system for OGRE
-# (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-# - Try to find Cocoa
-# Once done, this will define
-#
-# Cocoa_FOUND - system has Cocoa
-# Cocoa_INCLUDE_DIRS - the Cocoa include directories
-# Cocoa_LIBRARIES - link these to use Cocoa
-
-include(FindPkgMacros)
-findpkg_begin(Cocoa)
-
-# construct search paths
-set(Cocoa_PREFIX_PATH ${Cocoa_HOME} $ENV{Cocoa_HOME})
-create_search_paths(Cocoa)
-# redo search if prefix path changed
-clear_if_changed(Cocoa_PREFIX_PATH
- Cocoa_LIBRARY_FWK
- Cocoa_LIBRARY_REL
- Cocoa_LIBRARY_DBG
- Cocoa_INCLUDE_DIR
-)
-
-set(Cocoa_LIBRARY_NAMES Cocoa)
-get_debug_names(Cocoa_LIBRARY_NAMES)
-
-use_pkgconfig(Cocoa_PKGC Cocoa)
-
-findpkg_framework(Cocoa)
-
-find_path(Cocoa_INCLUDE_DIR NAMES Cocoa.h HINTS ${Cocoa_INC_SEARCH_PATH}
${Cocoa_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Cocoa)
-find_library(Cocoa_LIBRARY_REL NAMES ${Cocoa_LIBRARY_NAMES} HINTS
${Cocoa_LIB_SEARCH_PATH} ${Cocoa_PKGC_LIBRARY_DIRS})
-find_library(Cocoa_LIBRARY_DBG NAMES ${Cocoa_LIBRARY_NAMES_DBG} HINTS
${Cocoa_LIB_SEARCH_PATH} ${Cocoa_PKGC_LIBRARY_DIRS})
-make_library_set(Cocoa_LIBRARY)
-
-findpkg_finish(Cocoa)
-add_parent_dir(Cocoa_INCLUDE_DIRS Cocoa_INCLUDE_DIR)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cocoa DEFAULT_MSG Cocoa_LIBRARIES
Cocoa_INCLUDE_DIRS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
