Text archives Help

---

Author: cgribble
Date: Wed Oct 11 18:17:24 2006
New Revision: 1218

Added:
   trunk/CMake/FindPabst.cmake
Modified:
   trunk/CMakeLists.txt
   trunk/Core/CMakeLists.txt
   trunk/Engine/CMakeLists.txt
   trunk/Engine/Renderers/CMakeLists.txt
   trunk/Engine/Renderers/Raydumper.h
Log:
Make pabst stuff an external (but optional) dependency.  Removed 
RayTree.{h,cc},
complie Raydumper.{h,cc} only if pabst library is found.  E-mail me
(cgribble@sci.utah.edu) for access to the pabst sources.


Added: trunk/CMake/FindPabst.cmake
==============================================================================
--- (empty file)
+++ trunk/CMake/FindPabst.cmake Wed Oct 11 18:17:24 2006
@@ -0,0 +1,23 @@
+
+SET(PABST_INSTALL_PATH "" CACHE PATH "Default search path for PABST install")
+
+IF(PABST_INSTALL_PATH)
+FIND_PATH(PABST_INCLUDE_DIR pabst.h
+                           ${PABST_INSTALL_PATH}/include
+                           /usr/include
+                           /usr/local/include
+                           )
+
+FIND_LIBRARY(PABST_LIBRARIES NAMES pabst
+                            PATHS ${PABST_INSTALL_PATH}/lib
+                                  ${THIRD_PARTY_INSTALL_PATH}/lib
+                                  /usr/lib
+                                  /usr/local/lib
+                            )
+
+IF(PABST_INCLUDE_DIR AND PABST_LIBRARIES)
+   SET(PABST_FOUND TRUE)
+ELSE(PABST_INCLUDE_DIR AND PABST_LIBRARIES)
+   MESSAGE("Could not find PABST")
+ENDIF(PABST_INCLUDE_DIR AND PABST_LIBRARIES)
+ENDIF(PABST_INSTALL_PATH)

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Wed Oct 11 18:17:24 2006
@@ -44,6 +44,7 @@
 # Search for common dependencies.
 INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindX11andGL.cmake) # Find X11 
and GL, specialized on OSX and Cygwin
 INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindTeem.cmake)     # Locate Teem.
+INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindPabst.cmake)    # Locate pabst
 
 # Check for specific machine/compiler options.
 INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/ConfigIA64.cmake)       # SGI 
Itanium2 flags.

Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt   (original)
+++ trunk/Core/CMakeLists.txt   Wed Oct 11 18:17:24 2006
@@ -58,12 +58,9 @@
      Util/Endian.h
      Util/LargeFile.h
      Util/LargeFile.cc
-     Util/RayTree.h
-     Util/RayTree.cc
      Util/Stat.h
      Util/ThreadStorage.h
      Util/ThreadStorage.cc)
-
 
 ADD_LIBRARY (Manta_Core ${CORE_SOURCES})
 

Modified: trunk/Engine/CMakeLists.txt
==============================================================================
--- trunk/Engine/CMakeLists.txt (original)
+++ trunk/Engine/CMakeLists.txt Wed Oct 11 18:17:24 2006
@@ -34,5 +34,10 @@
                                    ${X11_LIBRARIES}
                                    )
 
+IF(PABST_FOUND)
+  INCLUDE_DIRECTORIES(${PABST_INCLUDE_DIR})
+  TARGET_LINK_LIBRARIES(Manta_Engine ${PABST_LIBRARIES})
+ENDIF(PABST_FOUND)
+
 # Build the factory library
 SUBDIRS(Factory)

Modified: trunk/Engine/Renderers/CMakeLists.txt
==============================================================================
--- trunk/Engine/Renderers/CMakeLists.txt       (original)
+++ trunk/Engine/Renderers/CMakeLists.txt       Wed Oct 11 18:17:24 2006
@@ -4,10 +4,15 @@
      Renderers/Moire.cc
      Renderers/NullRenderer.h
      Renderers/NullRenderer.cc
-     Renderers/Raydumper.h
-     Renderers/Raydumper.cc
      Renderers/RayGen.h
      Renderers/RayGen.cc
      Renderers/Raytracer.h
      Renderers/Raytracer.cc
      )
+
+IF (PABST_FOUND)
+SET(Manta_Renderers_SRCS ${Manta_Renderers_SRCS}
+                        Renderers/Raydumper.h
+                        Renderers/Raydumper.cc
+                        )
+ENDIF (PABST_FOUND)

Modified: trunk/Engine/Renderers/Raydumper.h
==============================================================================
--- trunk/Engine/Renderers/Raydumper.h  (original)
+++ trunk/Engine/Renderers/Raydumper.h  Wed Oct 11 18:17:24 2006
@@ -2,11 +2,11 @@
 #ifndef Manta_Engine_Raydumper_h
 #define Manta_Engine_Raydumper_h
 
-#include <Core/Util/RayTree.h>
 #include <Interface/MantaInterface.h>
 #include <Interface/RayPacket.h>
 #include <Interface/Renderer.h>
 #include <Interface/ShadowAlgorithm.h>
+#include <pabst.h>
 #include <sgi_stl_warnings_off.h>
 #include <string>
 #include <vector>

---

• [MANTA] r1218 - in trunk: . CMake Core Engine Engine/Renderers, cgribble, 10/11/2006

---

Archive powered by MHonArc 2.6.16.