[artoolkit-commits] SF.net SVN: artoolkit:[313] branches/hartmut-pre-2_8/artoolkit

[<ret...@us...>]

Revision: 313
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=313&view=rev
Author:   retrakker
Date:     2012-09-26 13:20:05 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
quick fix to get ARToolKit working on newer versions of OSX which dont have Carbon and the respective capture in there anymore. GStreamer is mature enough on OSX and more flexible than running our own QtKit QtMovie mixture.

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c

Added Paths:
-----------
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2012-09-26 13:20:05 UTC (rev 313)
@@ -4,13 +4,8 @@
 # (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter                        #
 ##############################################################################
 
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.8)
 
-if(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 NEW)
-	cmake_policy(SET CMP0006 OLD)
-endif(COMMAND cmake_policy)
-
 project(ARToolKit)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
@@ -65,8 +60,8 @@
 # Apple presets
 #
 if   (APPLE)
-	set(CMAKE_OSX_ARCHITECTURES ppc;i386)
-	set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk CACHE PATH "SDK to link against")
+#	set(CMAKE_OSX_ARCHITECTURES i386)
+#	set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk CACHE PATH "SDK to link against")
 endif(APPLE)
 
 #

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake	2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake	2012-09-26 13:20:05 UTC (rev 313)
@@ -5,44 +5,55 @@
 #  GSTREAMER_INCLUDE_DIR - the GStreamer include directory
 #  GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
 #  GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
+
+# Copyright (c) 2006, Tim Beaulen <tb...@gm...>
 #
-#  (c)2006, Tim Beaulen <tb...@gm...>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
 
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
    # in cache already
    SET(GStreamer_FIND_QUIETLY TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
    SET(GStreamer_FIND_QUIETLY FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
 
 IF (NOT WIN32)
    # use pkg-config to get the directories and then use these values
    # in the FIND_PATH() and FIND_LIBRARY() calls
-   INCLUDE(UsePkgConfig)
-   PKGCONFIG(gstreamer-0.10 _GStreamerIncDir _GStreamerLinkDir _GStreamerLinkFlags _GStreamerCflags)
-   #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${_GStreamerIncDir}")
-   #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${_GStreamerLinkDir}")
-   #MESSAGE(STATUS "DEBUG: GStreamer link flags = ${_GStreamerLinkFlags}")
-   #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${_GStreamerCflags}") 
-   SET(GSTREAMER_DEFINITIONS ${_GStreamerCflags})
+   FIND_PACKAGE(PkgConfig)
+   PKG_CHECK_MODULES(PC_GSTREAMER QUIET gstreamer-0.10)
+   #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
+   #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
+   #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") 
+   SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER})
 ENDIF (NOT WIN32)
 
 FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
    PATHS
-   ${_GStreamerIncDir}
+   ${PC_GSTREAMER_INCLUDEDIR}
+   ${PC_GSTREAMER_INCLUDE_DIRS}
    #PATH_SUFFIXES gst
    )
 
 FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
    PATHS
-   ${_GStreamerLinkDir}
+   ${PC_GSTREAMER_LIBDIR}
+   ${PC_GSTREAMER_LIBRARY_DIRS}
    )
 
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
+   PATHS
+   ${PC_GSTREAMER_LIBDIR}
+   ${PC_GSTREAMER_LIBRARY_DIRS}
+   )
+
 FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
    PATHS
-   ${_GStreamerLinkDir}
+   ${PC_GSTREAMER_LIBDIR}
+   ${PC_GSTREAMER_LIBRARY_DIRS}
    )
 
 IF (GSTREAMER_INCLUDE_DIR)
@@ -63,21 +74,13 @@
    MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
 ENDIF (GSTREAMER_INTERFACE_LIBRARY)
 
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
-   SET(GSTREAMER_FOUND TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
-   SET(GSTREAMER_FOUND FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+#INCLUDE(FindPackageHandleStandardArgs)
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
 
-IF (GSTREAMER_FOUND)
-   IF (NOT GStreamer_FIND_QUIETLY)
-      MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES}")
-   ENDIF (NOT GStreamer_FIND_QUIETLY)
-ELSE (GSTREAMER_FOUND)
-   IF (GStreamer_FIND_REQUIRED)
-      MESSAGE(SEND_ERROR "Could NOT find GStreamer")
-   ENDIF (GStreamer_FIND_REQUIRED)
-ENDIF (GSTREAMER_FOUND)
+#MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
 
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_INTERFACE_LIBRARY)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
 
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
+

Added: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake	                        (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake	2012-09-26 13:20:05 UTC (rev 313)
@@ -0,0 +1,48 @@
+# - Try to find the GLIB2 libraries
+# Once done this will define
+#
+#  GLIB2_FOUND - system has glib2
+#  GLIB2_INCLUDE_DIR - the glib2 include directory
+#  GLIB2_LIBRARIES - glib2 library
+
+# Copyright (c) 2008 Laurent Montel, <mo...@kd...>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+    # Already in cache, be silent
+    set(GLIB2_FIND_QUIETLY TRUE)
+endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+
+if (NOT WIN32)
+   find_package(PkgConfig REQUIRED)
+   pkg_check_modules(PKG_GLIB REQUIRED glib-2.0)
+endif(NOT WIN32)
+
+find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
+          PATH_SUFFIXES glib-2.0
+          PATHS ${PKG_GLIB_INCLUDE_DIRS} )
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GLIB2_LIBRARIES
+             NAMES glib-2.0
+             PATHS ${PKG_GLIB_LIBRARY_DIRS} )
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+          PATH_SUFFIXES glib-2.0/include ../lib/glib-2.0/include
+          PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GLIB2_INCLUDE_DIR ${GLIB2_MAIN_INCLUDE_DIR})
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+  set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR})
+endif(GLIB2_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2  DEFAULT_MSG  GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2012-09-26 13:20:05 UTC (rev 313)
@@ -42,19 +42,22 @@
 
 
 # Video
-if(APPLE)
-	add_subdirectory(VideoMacOSX)
-endif(APPLE)
 
+# the old capture code doesnt work with OSX 10.6 and upwards
+
+#if(APPLE)
+#	add_subdirectory(VideoMacOSX)
+#endif(APPLE)
+
 if(WIN32)
 	add_subdirectory(VideoWin32DirectShow)
 endif(WIN32)
 
-if(UNIX)
+if(UNIX OR APPLE)
 	if(USE_GSTREAMER)
 		add_subdirectory(VideoGStreamer)
 	endif(USE_GSTREAMER)
-endif(UNIX)
+endif()
 
 
 if(OPENVRML_FOUND)

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt	2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt	2012-09-26 13:20:05 UTC (rev 313)
@@ -1,21 +1,30 @@
 SET(LIB_NAME ARvideo)
 
+find_package(Glib2)
+find_package(LibXml2)
+
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/include
 	${GSTREAMER_INCLUDE_DIR}
+	${GLIB2_INCLUDE_DIR}
+	${LIBXML2_INCLUDE_DIR}
 	)
+	
 
 SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/video.h)
 
 SET(SRCS video.c)
 
-ADD_DEFINITIONS(${GSTREAMER_DEFINITIONS})
+ADD_DEFINITIONS(${GSTREAMER_DEFINITIONS} ${LIBXML2_DEFINITIONS} )
 
 ADD_LIBRARY(${LIB_NAME} SHARED ${HDRS} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${LIB_NAME} 
 	AR 
 	${GSTREAMER_LIBRARIES}
+	${GSTREAMER_BASE_LIBRARY}
+	${GLIB2_LIBRARIES}
+	${LIBXML2_LIBRARIES}
 	)
 
 set_target_properties(${LIB_NAME} PROPERTIES

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c	2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c	2012-09-26 13:20:05 UTC (rev 313)
@@ -11,7 +11,7 @@
 #include <AR/config.h>
 #include <AR/ar.h>
 #include <AR/video.h>
-
+	 
 /* include GLib for GStreamer */
 #include <glib.h>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.