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

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

Revision: 292
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=292&view=rev
Author:   retrakker
Date:     2008-08-21 10:55:22 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
fixed CMake build system for Mac OS X

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-08-21 03:48:04 UTC (rev 291)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-08-21 10:55:22 UTC (rev 292)
@@ -1,9 +1,30 @@
 # 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.*")
+	set(_datafiles 
+		${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
+		${CMAKE_SOURCE_DIR}/bin/Data/object_data
+		${CMAKE_SOURCE_DIR}/bin/Data/object_data2
+		${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
+		${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+		${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+		${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+	)
+
+	set(_datafiles_multi 
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
+		${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
+	)
 		
 	if(APPLE)
 		set_source_files_properties(
@@ -11,10 +32,16 @@
 			PROPERTIES
 			MACOSX_PACKAGE_LOCATION "Resources/Data"
 			)
+		set_source_files_properties(
+			${_datafiles_multi}
+			PROPERTIES
+			HEADER_FILE_ONLY TRUE
+			MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
+			)
 			
-		add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles})
+		add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles} ${_datafiles_multi})
 	else(APPLE)
-		add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles})
+		add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles} ${_datafiles_multi})
 	endif(APPLE)
 endmacro(artoolkit_executable)
 
@@ -50,6 +77,7 @@
 		LIBRARY DESTINATION ${lib_dest}	
 		RUNTIME DESTINATION bin
 		PUBLIC_HEADER DESTINATION include/AR
+		BUNDLE DESTINATION /Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}
 		)
 		
 endmacro(artoolkit_exe_install target)

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt	2008-08-21 03:48:04 UTC (rev 291)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt	2008-08-21 10:55:22 UTC (rev 292)
@@ -4,9 +4,14 @@
 
 SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/video.h)
 
-SET(SRCS video.c ARVideoSettingsController.m ARVideoSettingsController.h videoInternal.h)
+SET(SRCS 
+	video.c
+	ARVideoSettingsController.m
+	ARVideoSettingsController.h
+	videoInternal.h
+	)
 
-ADD_LIBRARY(${LIB_NAME} SHARED ${HDRS} ${SRCS})
+ADD_LIBRARY(${LIB_NAME} STATIC ${HDRS} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${LIB_NAME} 
 	AR 
@@ -15,3 +20,10 @@
 	"-framework Cocoa"
 	"-framework Carbon"
 	)
+
+INSTALL(TARGETS 
+	${LIB_NAME}
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+	PUBLIC_HEADER DESTINATION include/AR)


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