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

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

Revision: 285
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=285&view=rev
Author:   retrakker
Date:     2008-08-18 23:24:59 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
- added DSVL based video capture for Windows into the CMake build system

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt	2008-08-18 23:23:26 UTC (rev 284)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt	2008-08-18 23:24:59 UTC (rev 285)
@@ -10,9 +10,17 @@
 
 FILE(GLOB SRCS *.c)
 
-SET(HDRS ${HDRS} ${CMAKE_BINARY_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})
 
-TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
+install(TARGETS AR
+	ARCHIVE DESTINATION lib	
+	RUNTIME DESTINATION bin
+	PUBLIC_HEADER DESTINATION include/AR
+	)
+	

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2008-08-18 23:23:26 UTC (rev 284)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2008-08-18 23:24:59 UTC (rev 285)
@@ -1,15 +1,19 @@
 # Core library
-ADD_SUBDIRECTORY(AR)
-ADD_SUBDIRECTORY(ARMulti)
+add_subdirectory(AR)
+add_subdirectory(ARMulti)
 
 # GL utility
-ADD_SUBDIRECTORY(Gl)
+add_subdirectory(Gl)
 
 # Video
 IF   (APPLE)
 	ADD_SUBDIRECTORY(VideoMacOSX)
 ENDIF(APPLE)
 
+if(WIN32)
+	add_subdirectory(VideoWin32DirectShow)
+endif(WIN32)
+
 IF   (UNIX)
 	IF   (USE_GSTREAMER)
 		ADD_SUBDIRECTORY(VideoGStreamer)

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt	2008-08-18 23:23:26 UTC (rev 284)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt	2008-08-18 23:24:59 UTC (rev 285)
@@ -1,16 +1,41 @@
-SET(LIB_NAME ARgsub)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+find_package(OpenGL)
+find_package(GLUT)
 
-SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsub.h)
 
-FILE(GLOB SRCS gsub.c)
+if(GLUT_FOUND)
 
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
+	set(LIB_NAME ARgsub)
 
-TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
+	include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
 
+	set(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsub.h)
 
+	file(GLOB SRCS gsub.c)
+
+	add_library(${LIB_NAME} ${HDRS} ${SRCS})
+
+	target_link_libraries(${LIB_NAME} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
+	
+	artoolkit_lib_install(${LIB_NAME})
+	
+	include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
+	
+	set(LIB_NAME ARgsubUtil)
+
+	set(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsubUtil.h)
+
+	file(GLOB SRCS gsubUtil.c)
+
+	add_library(${LIB_NAME} ${HDRS} ${SRCS})
+
+	target_link_libraries(${LIB_NAME} AR)
+	
+	
+	artoolkit_lib_install(${LIB_NAME})
+	
+endif(GLUT_FOUND)
+
 SET(LIB_NAME ARgsub_lite)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
@@ -23,18 +48,12 @@
 
 TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
 
+artoolkit_lib_install(${LIB_NAME})
 
-SET(LIB_NAME ARgsubUtil)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
-SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsubUtil.h)
 
-FILE(GLOB SRCS gsubUtil.c)
 
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
 
-TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
 
 
-


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