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

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

Revision: 280
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=280&view=rev
Author:   retrakker
Date:     2008-03-04 03:26:53 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
updated CMakeFiles to make the build system really source-tree agnostic. Added macros for bundling data files properly

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt

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

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2008-02-18 23:50:16 UTC (rev 279)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2008-03-04 11:26:53 UTC (rev 280)
@@ -1,6 +1,12 @@
+##############################################################################
+# CMake build system for ARToolKit 2.7.x                                     #
+#                                                                            #
+# (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter                        #
+##############################################################################
+
 PROJECT(ARToolKit)
 
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
 
 SET(ARTOOLKIT_VERSION_MAJOR 2)
 SET(ARTOOLKIT_VERSION_MINOR 72)
@@ -11,19 +17,6 @@
 SET(LIBRARY_OUTPUT_PATH    ${CMAKE_BINARY_DIR}/lib)
 
 
-CONFIGURE_FILE(
-	${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat 
-	${CMAKE_BINARY_DIR}/bin/Data/camera_para.dat 
-	COPYONLY
-)
-
-CONFIGURE_FILE(
-	${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro 
-	${CMAKE_BINARY_DIR}/bin/Data/patt.hiro
-	COPYONLY
-)
-	
-
 IF   (APPLE)
 	SET(CMAKE_OSX_ARCHITECTURES ppc;i386)
 	SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
@@ -39,7 +32,11 @@
 	ENDIF(GSTREAMER_FOUND)
 ENDIF(UNIX)
 
+# right order of include files is important
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR}/include)
 
+INCLUDE(ARToolKitHelper)
+
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(examples)

Added: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	                        (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-03-04 11:26:53 UTC (rev 280)
@@ -0,0 +1,19 @@
+# some simple macros to inject files into bundles
+
+MACRO(ARTOOLKIT_EXECUTABLE EXE_NAME SRCS)
+	FILE(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
+	FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
+	FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
+	IF(APPLE)
+		SET_SOURCE_FILES_PROPERTIES(
+			${_datafiles}
+			PROPERTIES
+			MACOSX_PACKAGE_LOCATION "Resources/Data"
+			)
+			
+		ADD_EXECUTABLE(${EXE_NAME} MACOSX_BUNDLE ${SRCS} ${_datafiles})
+	ELSE(APPLE)
+		ADD_EXECUTABLE(${EXE_NAME} WIN32 ${SRCS} ${_datafiles})
+	ENDIF(APPLE)
+ENDMACRO(ARTOOLKIT_EXECUTABLE)
+

Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt	2008-02-18 23:50:16 UTC (rev 279)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt	2008-03-04 11:26:53 UTC (rev 280)
@@ -2,15 +2,9 @@
 
 SET(SRCS simpleLite.c)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-
 INCLUDE(FindOpenGL)
 INCLUDE(FindGLUT)
 
-IF   (APPLE)
-	ADD_EXECUTABLE(${EXE_NAME} MACOSX_BUNDLE ${SRCS})
-ELSE (APPLE)
-	ADD_EXECUTABLE(${EXE_NAME} WIN32 ${SRCS})
-ENDIF(APPLE)
+ARTOOLKIT_EXECUTABLE(${EXE_NAME} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})

Modified: branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in	2008-02-18 23:50:16 UTC (rev 279)
+++ branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in	2008-03-04 11:26:53 UTC (rev 280)
@@ -75,12 +75,15 @@
 #undef  AR_INPUT_GSTREAMER
 
 /* 
- * CMake based configure
+ * CMake based configuration:
  */
-#if (@USE_GSTREAMER@ == 1)
+#define USE_GSTREAMER @USE_GSTREAMER@
+
+#if (USE_GSTREAMER)
 #define AR_INPUT_GSTREAMER 1
 #endif
 
+
 #  ifdef AR_INPUT_V4L
 #    ifdef USE_EYETOY
 #      define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt	2008-02-18 23:50:16 UTC (rev 279)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt	2008-03-04 11:26:53 UTC (rev 280)
@@ -4,12 +4,13 @@
 
 CONFIGURE_FILE(
 	${CMAKE_SOURCE_DIR}/include/${LIB_NAME}/config.h.in
-	${CMAKE_SOURCE_DIR}/include/${LIB_NAME}/config.h
+	${CMAKE_BINARY_DIR}/include/${LIB_NAME}/config.h
 	)
 
+
 FILE(GLOB SRCS *.c)
 
-SET(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/config.h)
+SET(HDRS ${HDRS} ${CMAKE_BINARY_DIR}/include/AR/config.h)
 SET(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
 
 ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})

Modified: branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt	2008-02-18 23:50:16 UTC (rev 279)
+++ branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt	2008-03-04 11:26:53 UTC (rev 280)
@@ -2,15 +2,9 @@
 
 SET(SRCS mk_patt.c)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-
 INCLUDE(FindOpenGL)
 INCLUDE(FindGLUT)
 
-IF   (APPLE)
-	ADD_EXECUTABLE(${EXE_NAME} MACOSX_BUNDLE ${SRCS})
-ELSE (APPLE)
-	ADD_EXECUTABLE(${EXE_NAME} WIN32 ${SRCS})
-ENDIF(APPLE)
+ARTOOLKIT_EXECUTABLE(${EXE_NAME} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})


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