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

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

Revision: 307
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=307&view=rev
Author:   retrakker
Date:     2008-09-22 11:27:53 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
minor fix for Mac to bundle datafiles

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
    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-09-10 05:07:07 UTC (rev 306)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2008-09-22 11:27:53 UTC (rev 307)
@@ -7,7 +7,8 @@
 cmake_minimum_required(VERSION 2.4)
 
 if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
+	cmake_policy(SET CMP0003 NEW)
+	cmake_policy(SET CMP0006 OLD)
 endif(COMMAND cmake_policy)
 
 project(ARToolKit)

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-09-10 05:07:07 UTC (rev 306)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-09-22 11:27:53 UTC (rev 307)
@@ -69,6 +69,7 @@
 			HEADER_FILE_ONLY TRUE
 			MACOSX_PACKAGE_LOCATION "Resources/Data"
 			)
+			
 		set_source_files_properties(
 			${ARTOOLKIT_FILES_DATA_MULTI}
 			PROPERTIES
@@ -78,6 +79,8 @@
 			
 		add_executable(${EXE_NAME} MACOSX_BUNDLE 
 			${${SRCS}} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+			${ARTOOLKIT_FILES_DATA}
+			${ARTOOLKIT_FILES_DATA_MULTI}
 			)
 			
 	else(APPLE)
@@ -93,9 +96,12 @@
 	else (WIN32)
 		set(lib_dest lib)
 	endif(WIN32)
+	
+	set(cmake_version_short "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
-	if (CMAKE_VERSION MATCHES 2.6)
+	if (cmake_version_short GREATER "2.5")
 		install(TARGETS ${target}
+			BUNDLE DESTINATION "/Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}"
 			RUNTIME DESTINATION bin
 			LIBRARY DESTINATION ${lib_dest}	
 			ARCHIVE DESTINATION lib
@@ -105,7 +111,7 @@
 			GROUP_EXECUTE GROUP_READ
 			WORLD_EXECUTE WORLD_READ
 			)
-	else(CMAKE_VERSION MATCHES 2.6)
+	else(cmake_version_short GREATER "2.5")
 		install(TARGETS ${target}
 			RUNTIME DESTINATION bin
 			LIBRARY DESTINATION ${lib_dest}	
@@ -115,7 +121,7 @@
 			GROUP_EXECUTE GROUP_READ
 			WORLD_EXECUTE WORLD_READ
 			)
-	endif(CMAKE_VERSION MATCHES 2.6)
+	endif(cmake_version_short GREATER "2.5")
 		
 endmacro(artoolkit_install target)
 


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