[artoolkit-commits] SF.net SVN: artoolkit:[294] branches/hartmut-pre-2_8/artoolkit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
|
From: <ret...@us...> - 2008-08-21 20:39:26
|
Revision: 294
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=294&view=rev
Author: retrakker
Date: 2008-08-21 20:39:35 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Sync machines
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
@@ -40,6 +40,14 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Library output folder")
#
+# 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")
+endif(APPLE)
+
+#
# Preset for Visual Studio products
#
if(MSVC)
@@ -76,11 +84,6 @@
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
-if (APPLE)
- set(CMAKE_OSX_ARCHITECTURES ppc;i386)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
-endif(APPLE)
-
if (UNIX)
set(USE_GSTREAMER 0)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 20:39:35 UTC (rev 294)
@@ -180,3 +180,11 @@
artoolkit_exe_install(${exe_name})
endmacro(artoolkit_utility_glut name source_files)
+
+
+macro(artoolkit_framework)
+
+
+
+endmacro(artoolkit_framework)
+
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 20:39:35 UTC (rev 294)
@@ -11,8 +11,9 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ARToolKit for ${CMAKE_GENERATOR} is an All-In-One package for developing AR applications")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${CPACK_RESOURCE_FILE_README})
set(CPACK_PACKAGE_VERSION_MAJOR ${ARTOOLKIT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${ARTOOLKIT_VERSION_MINOR})
@@ -24,6 +25,7 @@
if(WIN32)
+ # we focus on using NSIS for Windows - thus add some more icons
set(CPACK_NSIS_MENU_LINKS
"bin" "ARToolKit application folder"
"${ARTOOLKIT_SHARE_FOLDER}/ChangeLog.txt" "ARToolKit ${ARTOOLKIT_VERSION_FULL} ChangeLog"
@@ -45,9 +47,12 @@
else(WIN32)
if (APPLE)
- set(CPACK_GENERATOR "PackageMaker;STGZ")
- INCLUDE(CPack)
+ # only use the PackageMaker version on Mac
+ set(CPACK_GENERATOR "PackageMaker")
endif(APPLE)
-endif(WIN32)
-
+endif(WIN32)
+
+#
+# And finally include CPack
+#
include(CPack)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|