-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
[MANTA] r787 - in trunk: . Core Core/Shm Engine/Control Engine/Display Image StandAlone fox
Chronological Thread
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r787 - in trunk: . Core Core/Shm Engine/Control Engine/Display Image StandAlone fox
- Date: Tue, 13 Dec 2005 16:41:12 -0700 (MST)
Author: abe
Date: Tue Dec 13 16:41:10 2005
New Revision: 787
Added:
trunk/fox/MFStreamData.cc
- copied, changed from r785, trunk/Core/Shm/MFStreamData.cc
trunk/fox/MFStreamData.h
- copied, changed from r785, trunk/Core/Shm/MFStreamData.h
trunk/fox/SHMImageDisplay.cc
- copied, changed from r785, trunk/Engine/Display/SHMImageDisplay.cc
trunk/fox/SHMImageDisplay.h
- copied, changed from r785, trunk/Engine/Display/SHMImageDisplay.h
trunk/fox/ShmSemaphore.cc
- copied, changed from r785, trunk/Core/Shm/ShmSemaphore.cc
trunk/fox/ShmSemaphore.h
- copied unchanged from r785, trunk/Core/Shm/ShmSemaphore.h
trunk/fox/mf_stream_test.cc
- copied, changed from r785, trunk/StandAlone/mf_stream_test.cc
Removed:
trunk/Core/Shm/MFStreamData.cc
trunk/Core/Shm/MFStreamData.h
trunk/Core/Shm/ShmSemaphore.cc
trunk/Core/Shm/ShmSemaphore.h
trunk/Engine/Display/SHMImageDisplay.cc
trunk/Engine/Display/SHMImageDisplay.h
trunk/StandAlone/mf_stream_test.cc
Modified:
trunk/CMakeLists.txt
trunk/Core/CMakeLists.txt
trunk/Engine/Control/RTRT_register.cc
trunk/Engine/Display/CMakeLists.txt
trunk/Image/CMakeLists.txt
trunk/StandAlone/CMakeLists.txt
trunk/fox/CMakeLists.txt
trunk/fox/MediaFusionBridge.h
trunk/fox/sc_demo.cc
Log:
1.) Switched CMake configuration around so that teem and fox are searched for
in the:
THIRD_PARTY_INCLUDE_PATH and THIRD_PARTY_LIBRARY_PATH
variables using the FIND_DIRECTORY and FIND_LIBRARY cmake commands.
Set these two variables to a common prefix directory (for example in my case:
/home/sci/abe/build-suse) or set the variables manually.
2.) Moved all Media Fusion / SC2005 demo material into the fox directory.
Added a BUILD_SC2005DEMO cmake option (only appears when running on SGI Linux)
3.) Removed SHMImageDisplay from the bin/manta command line options.
M Image/CMakeLists.txt
D Core/Shm/ShmSemaphore.cc
D Core/Shm/ShmSemaphore.h
D Core/Shm/MFStreamData.cc
D Core/Shm/MFStreamData.h
M Core/CMakeLists.txt
D StandAlone/mf_stream_test.cc
M StandAlone/CMakeLists.txt
A fox/MFStreamData.cc
A fox/SHMImageDisplay.h
M fox/CMakeLists.txt
A fox/ShmSemaphore.cc
A fox/ShmSemaphore.h
M fox/sc_demo.cc
A fox/MFStreamData.h
A fox/mf_stream_test.cc
A fox/SHMImageDisplay.cc
M fox/MediaFusionBridge.h
M Engine/Control/RTRT_register.cc
D Engine/Display/SHMImageDisplay.cc
D Engine/Display/SHMImageDisplay.h
M Engine/Display/CMakeLists.txt
M CMakeLists.txt
Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -12,6 +12,13 @@
SET(BUILD_SHARED_LIBS ON)
SET(CMAKE_VERBOSE_MAKEFILE ON)
+############################################################
+# Set default search directory prefixes for third party libraries like
+# fox and teem.
+
+SET(THIRD_PARTY_LIBRARY_PATH "" CACHE STRING "Default search path for
third-party libraries")
+SET(THIRD_PARTY_INCLUDE_PATH "" CACHE STRING "Default search path for
third-party headers")
+
# Default to building release. I can't tell you how many times folks
# cry because Manta suddenly got slower. This will hopefully
# alieviate it some.
@@ -174,13 +181,7 @@
ENDIF (SWIG_FOUND)
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.9)
-SUBDIRS( ${MAIN_SUBDIRS} )
-# Check to see whether the optional glfw/ directory should be included.
-SET(BUILD_GLFW 0 CACHE BOOL "Build glfw frontend.")
-IF(BUILD_GLFW)
- SUBDIRS(glfw)
-ENDIF(BUILD_GLFW)
# Check to see whether the histx performance monitoring tools should
# be built on IA64.
@@ -197,17 +198,15 @@
# Look for Teem http://teem.sourceforge.net/
FIND_LIBRARY( FOUND_TEEM_LIB NAMES teem
- PATHS /usr/local/lib /usr/lib
+ PATHS ${THIRD_PARTY_LIBRARY_PATH}
/usr/local/lib /usr/lib
DOC "Teem library (This is a path.)" )
-FIND_PATH ( FOUND_TEEM_INCLUDE NAMES teem/nrrd.h /usr/local/include
/usr/include
+FIND_PATH ( FOUND_TEEM_INCLUDE teem/nrrd.h ${THIRD_PARTY_INCLUDE_PATH}
/usr/local/include /usr/include
DOC "Teem Include (This is a path.)" )
-# Check for teem dependencies
-IF(FOUND_TEEM_LIB)
- LINK_DIRECTORIES(${FOUND_TEEM_LIB})
-ENDIF(FOUND_TEEM_LIB)
+# Configure main subdirectories.
+SUBDIRS( ${MAIN_SUBDIRS} )
# Now that everything is done indicate that we have finished
# configuring at least once.
Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt (original)
+++ trunk/Core/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -43,18 +43,9 @@
SET (CORE_SOURCES ${CORE_SOURCES}
Geometry/AffineTransform.h
Geometry/AffineTransform.cc
- )
+ )
-IF(SGI_LINUX)
- SET (CORE_SOURCES ${CORE_SOURCES}
- Shm/ShmSemaphore.h
- Shm/ShmSemaphore.cc
- Shm/MFStreamData.h
- Shm/MFStreamData.cc
- )
-ENDIF(SGI_LINUX)
-
ADD_LIBRARY (Manta_Core ${CORE_SOURCES})
TARGET_LINK_LIBRARIES(Manta_Core SCIRun_Core)
@@ -63,3 +54,4 @@
ADD_LIBRARY (Manta_Core_XUtils XUtils/XHelper.cc)
TARGET_LINK_LIBRARIES(Manta_Core_XUtils SCIRun_Core Manta_Core)
TARGET_LINK_LIBRARIES(Manta_Core_XUtils ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
+
Modified: trunk/Engine/Control/RTRT_register.cc
==============================================================================
--- trunk/Engine/Control/RTRT_register.cc (original)
+++ trunk/Engine/Control/RTRT_register.cc Tue Dec 13 16:41:10 2005
@@ -2,7 +2,6 @@
#include <Engine/Display/NullDisplay.h>
#include <Engine/Display/OpenGLDisplay.h>
#include <Engine/Display/FileDisplay.h>
-#include <Engine/Display/SHMImageDisplay.h>
#include <Engine/IdleModes/ZoomIdleMode.h>
#include <Engine/ImageTraversers/NullImageTraverser.h>
#include <Engine/ImageTraversers/TiledImageTraverser.h>
@@ -46,9 +45,6 @@
engine->registerComponent("null", &NullDisplay::create);
engine->registerComponent("opengl", &OpenGLDisplay::create);
engine->registerComponent("file", &FileDisplay::create);
-#ifdef __ia64__
- engine->registerComponent("mf", &SHMImageDisplay::create);
-#endif
// Register image traversers
engine->registerComponent("null", &NullImageTraverser::create);
Modified: trunk/Engine/Display/CMakeLists.txt
==============================================================================
--- trunk/Engine/Display/CMakeLists.txt (original)
+++ trunk/Engine/Display/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -10,9 +10,4 @@
Display/OpenGLDisplay.h
)
-IF(SGI_LINUX)
- SET(Manta_Display_SRCS ${Manta_Display_SRCS}
- Display/SHMImageDisplay.h
- Display/SHMImageDisplay.cc
- )
-ENDIF(SGI_LINUX)
+
Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt (original)
+++ trunk/Image/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -13,7 +13,12 @@
IF (FOUND_TEEM_LIB)
# Add the library dependency
- SET (NRRD_IMAGE_LIB teem png)
+ SET (NRRD_IMAGE_LIB ${FOUND_TEEM_LIB} png)
+
+ IF(APPLE)
+ SET(NRRD_IMAGE_LIB ${NRRD_IMAGE_LIB} bz2 z)
+ ENDIF(APPLE)
+
ENDIF(FOUND_TEEM_LIB)
@@ -28,5 +33,8 @@
${NRRD_IMAGE_SRC}
)
-TARGET_LINK_LIBRARIES(Manta_Image Manta_Interface SCIRun_Core
+TARGET_LINK_LIBRARIES(Manta_Image
+ Manta_Interface
+ SCIRun_Core
+ Manta_Core
${NRRD_IMAGE_LIB})
Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt (original)
+++ trunk/StandAlone/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -39,17 +39,3 @@
${X11_LIBRARIES}
-lm)
ENDIF(BUILD_V3C1_TOOLS)
-
-IF(SGI_LINUX)
- ADD_EXECUTABLE(mf_stream_test mf_stream_test.cc
- ../fox/MediaFusionBridge.cc)
- TARGET_LINK_LIBRARIES(mf_stream_test Manta_Engine
- Manta_UserInterface
- Manta_Model
- Manta_Image
- Manta_Interface
- Manta_Core
- SCIRun_Core
- ${CMAKE_THREAD_LIBS_INIT}
- )
-ENDIF(SGI_LINUX)
Modified: trunk/fox/CMakeLists.txt
==============================================================================
--- trunk/fox/CMakeLists.txt (original)
+++ trunk/fox/CMakeLists.txt Tue Dec 13 16:41:10 2005
@@ -1,13 +1,24 @@
-SET(FOX_PATH "/store/rhodes/abe/build-tomahawk" CACHE PATH "")
-IF(FOX_PATH)
+# Determine the version of fox to use. Case sensitive
+SET(FOX_STATIC FOX-1.5 CACHE STRING "Fox Library version string")
- SET(FOX_INCLUDE ${FOX_PATH}/include/fox-1.5 CACHE PATH "")
- SET(FOX_LIB ${FOX_PATH}/lib CACHE PATH "")
- SET(FOX_STATIC FOX-1.5 CACHE STRING "")
+# Search for the actual fox library.
+FIND_LIBRARY( FOUND_FOX_LIB NAMES ${FOX_STATIC}
+ PATHS ${THIRD_PARTY_LIBRARY_PATH}
/usr/local/lib /usr/lib
+ DOC "Fox library path" )
- INCLUDE_DIRECTORIES(${FOX_INCLUDE})
- LINK_DIRECTORIES (${FOX_LIB})
+# Seach for the fox include directory.
+STRING(TOLOWER ${FOX_STATIC} FOX_STATIC_LOWERCASE)
+FIND_PATH ( FOUND_FOX_INCLUDE fx.h
${THIRD_PARTY_INCLUDE_PATH}/${FOX_STATIC_LOWERCASE}
+ DOC "Fox Include path" )
+
+
+# If both were found, include fox interface code.
+IF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
+
+ INCLUDE_DIRECTORIES(${FOUND_FOX_INCLUDE})
+
+ # LINK_DIRECTORIES (${FOUND_FOX_LIB})
# Check to see if histx should be included.
IF(HISTX_PATH)
@@ -44,15 +55,6 @@
FMantaKdExplorer.cc
)
-IF (SGI_LINUX)
- SET(FMANTA_STATIC ${FMANTA_STATIC}
- MediaFusionBridge.h
- MediaFusionBridge.cc
- MediaFusionApp.h
- MediaFusionApp.cc
- )
-ENDIF(SGI_LINUX)
-
# Determine other libraries to link with
SET(FOX_X11_LIBRARIES m jpeg png tiff)
@@ -62,7 +64,6 @@
SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
Xcursor)
ENDIF(FOUND_XCURSOR)
-
# Append Xrandr if it is available.
FIND_LIBRARY( FOUND_XRANDR NAMES Xrandr PATHS /usr/X11R6/lib DOC "Only
required if Fox linked w/ Xrandr")
@@ -71,6 +72,7 @@
Xrandr)
ENDIF(FOUND_XRANDR)
+ # Specify all of the default libs
SET(OTHER_FOX_LIBS
Manta_Engine
Manta_UserInterface
@@ -80,45 +82,86 @@
Manta_Core
SCIRun_Core
- ${FOX_STATIC}
+ ${FOUND_FOX_LIB}
${CMAKE_THREAD_LIBS_INIT}
${OPENGL_LIBRARIES}
${X11_LIBRARIES}
${FOX_X11_LIBRARIES})
+ # Check to see if histx libs should be added
IF(HISTX_PATH)
SET(OTHER_FOX_LIBS
${OTHER_FOX_LIBS}
${HISTX_LINK}
)
ENDIF(HISTX_PATH)
-
- # Fox seems to insist on using pthreads.
- # IF(CMAKE_USE_SPROC_INIT)
- SET(OTHER_FOX_LIBS
- ${OTHER_FOX_LIBS}
- pthread
- )
- # ENDIF(CMAKE_USE_SPROC_INIT)
-
- # TARGET_LINK_LIBRARIES(FManta
- # ${OTHER_FOX_LIBS})
-
+
+ # Link against pthreads.
+ SET(OTHER_FOX_LIBS
+ ${OTHER_FOX_LIBS}
+ pthread
+ )
+
+ ##########################################################
+ # Add the dm_demo program
ADD_EXECUTABLE(dm_demo dm_demo.cc
${FMANTA_STATIC})
- # Add the dm_demo program
TARGET_LINK_LIBRARIES(dm_demo
${OTHER_FOX_LIBS})
-IF(SGI_LINUX)
- ADD_EXECUTABLE(sc_demo sc_demo.cc
- ${FMANTA_STATIC})
+ ##########################################################
+ # Build the SC2005 Demo code?
+ IF(SGI_LINUX)
+ SET(BUILD_SC2005DEMO 0 CACHE BOOL "Build SC2005 Media Fusion Interface")
+ IF(BUILD_SC2005DEMO)
+
+ SET(FMANTA_STATIC ${FMANTA_STATIC}
+ MediaFusionBridge.h
+ MediaFusionBridge.cc
+ MediaFusionApp.h
+ MediaFusionApp.cc
+ )
+
+ SET(MF_STATIC
+ MFStreamData.h
+ MFStreamData.cc
+ ShmSemaphore.h
+ ShmSemaphore.cc
+ SHMImageDisplay.h
+ SHMImageDisplay.cc
+ )
+
+ # Demo front end to run in VNC window
+ ADD_EXECUTABLE(sc_demo
+ sc_demo.cc
+ ${FMANTA_STATIC}
+ ${MF_STATIC})
+
+ TARGET_LINK_LIBRARIES(sc_demo
+ ${OTHER_FOX_LIBS})
+
+ # Test program.
+ ADD_EXECUTABLE(mf_stream_test
+ mf_stream_test.cc
+ MediaFusionBridge.cc
+ ${MF_STATIC}
+ )
+
+ TARGET_LINK_LIBRARIES(mf_stream_test Manta_Engine
+ Manta_UserInterface
+ Manta_Model
+ Manta_Image
+ Manta_Interface
+ Manta_Core
+ SCIRun_Core
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
- TARGET_LINK_LIBRARIES(sc_demo
- ${OTHER_FOX_LIBS})
-ENDIF(SGI_LINUX)
+ ENDIF(BUILD_SC2005DEMO)
+ ENDIF(SGI_LINUX)
+
+ENDIF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
-ENDIF(FOX_PATH)
Copied: trunk/fox/MFStreamData.cc (from r785, trunk/Core/Shm/MFStreamData.cc)
==============================================================================
--- trunk/Core/Shm/MFStreamData.cc (original)
+++ trunk/fox/MFStreamData.cc Tue Dec 13 16:41:10 2005
@@ -28,7 +28,7 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <Core/Shm/MFStreamData.h>
+#include <fox/MFStreamData.h>
#include <SCIRun/Core/Exceptions/ErrnoException.h>
#include <SCIRun/Core/Thread/Time.h>
Copied: trunk/fox/MFStreamData.h (from r785, trunk/Core/Shm/MFStreamData.h)
==============================================================================
--- trunk/Core/Shm/MFStreamData.h (original)
+++ trunk/fox/MFStreamData.h Tue Dec 13 16:41:10 2005
@@ -37,7 +37,7 @@
#define STRM_SHM_CREATE 0x1
#define STRM_SHM_ATTACH 0x0
-#include <Core/Shm/ShmSemaphore.h>
+#include <fox/ShmSemaphore.h>
#include <Interface/Image.h>
namespace Manta {
Modified: trunk/fox/MediaFusionBridge.h
==============================================================================
--- trunk/fox/MediaFusionBridge.h (original)
+++ trunk/fox/MediaFusionBridge.h Tue Dec 13 16:41:10 2005
@@ -27,7 +27,7 @@
*/
#include <X11/Xlib.h>
-#include <Core/Shm/MFStreamData.h>
+#include <fox/MFStreamData.h>
#include <SCIRun/Core/Thread/Thread.h>
#include <SCIRun/Core/Thread/Runnable.h>
Copied: trunk/fox/SHMImageDisplay.cc (from r785,
trunk/Engine/Display/SHMImageDisplay.cc)
==============================================================================
--- trunk/Engine/Display/SHMImageDisplay.cc (original)
+++ trunk/fox/SHMImageDisplay.cc Tue Dec 13 16:41:10 2005
@@ -29,7 +29,7 @@
-#include <Engine/Display/SHMImageDisplay.h>
+#include <fox/SHMImageDisplay.h>
#include <Image/SimpleImage.h>
#include <Image/Pixel.h>
Copied: trunk/fox/SHMImageDisplay.h (from r785,
trunk/Engine/Display/SHMImageDisplay.h)
==============================================================================
--- trunk/Engine/Display/SHMImageDisplay.h (original)
+++ trunk/fox/SHMImageDisplay.h Tue Dec 13 16:41:10 2005
@@ -35,7 +35,7 @@
#define Manta_Engine_SHMImageDisplay_h
#include <Interface/ImageDisplay.h>
-#include <Core/Shm/MFStreamData.h>
+#include <fox/MFStreamData.h>
#include <vector>
#include <string>
Copied: trunk/fox/ShmSemaphore.cc (from r785, trunk/Core/Shm/ShmSemaphore.cc)
==============================================================================
--- trunk/Core/Shm/ShmSemaphore.cc (original)
+++ trunk/fox/ShmSemaphore.cc Tue Dec 13 16:41:10 2005
@@ -29,7 +29,7 @@
#ifdef __ia64__
-#include <Core/Shm/ShmSemaphore.h>
+#include <fox/ShmSemaphore.h>
#include <SCIRun/Core/Exceptions/ErrnoException.h>
Copied: trunk/fox/mf_stream_test.cc (from r785,
trunk/StandAlone/mf_stream_test.cc)
==============================================================================
--- trunk/StandAlone/mf_stream_test.cc (original)
+++ trunk/fox/mf_stream_test.cc Tue Dec 13 16:41:10 2005
@@ -11,7 +11,7 @@
#include <string>
#include <iostream>
-#include <Core/Shm/MFStreamData.h>
+#include <fox/MFStreamData.h>
#include <fox/MediaFusionBridge.h>
#include <SCIRun/Core/Exceptions/Exception.h>
#include <SCIRun/Core/Exceptions/InternalError.h>
Modified: trunk/fox/sc_demo.cc
==============================================================================
--- trunk/fox/sc_demo.cc (original)
+++ trunk/fox/sc_demo.cc Tue Dec 13 16:41:10 2005
@@ -38,7 +38,7 @@
#include <X11/Xlib.h>
#include <Engine/Display/GLXImageDisplay.h>
-#include <Engine/Display/SHMImageDisplay.h>
+#include <fox/SHMImageDisplay.h>
#include <Model/Cameras/PinholeCamera.h>
#include <Model/Materials/Flat.h>
- [MANTA] r787 - in trunk: . Core Core/Shm Engine/Control Engine/Display Image StandAlone fox, abe, 12/13/2005
- Re: [MANTA] r787 - in trunk: . Core Core/Shm Engine/Control Engine/Display Image StandAlone fox, Abe Stephens, 12/13/2005
Archive powered by MHonArc 2.6.16.
