Text archives Help

---

Author: bigler
Date: Wed Oct 31 14:25:22 2007
New Revision: 1797

Modified:
   trunk/CMake/FindTeem.cmake
   trunk/Image/CMakeLists.txt
   trunk/Model/CMakeLists.txt
   trunk/Model/Materials/CMakeLists.txt
   trunk/Model/Readers/CMakeLists.txt
   trunk/Model/Readers/ParticleNRRD.h
   trunk/scenes/CMakeLists.txt
   trunk/tests/NoSSETest.cmake
   trunk/tests/SSETest.cmake
Log:
CMake/FindTeem.cmake
Image/CMakeLists.txt
Model/Materials/CMakeLists.txt
Model/Readers/CMakeLists.txt
scenes/CMakeLists.txt

  Reworking some of the Teem variables.  Most notable is that you now
  need to add INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS}) and
  LINK_DIRECTORIES(${TEEM_LIBRARY_DIRS}) for individual libraries.
  They are no longer global.

Model/CMakeLists.txt

  Added a Manta_Model_extra_libs variable that allows sub directories
  to add libraries to the link line.

Model/Readers/ParticleNRRD.h

  Reorder member variables to quiet warnings.

tests/NoSSETest.cmake
tests/SSETest.cmake

  Turn on VOLUMETEST scene.


Modified: trunk/CMake/FindTeem.cmake
==============================================================================
--- trunk/CMake/FindTeem.cmake  (original)
+++ trunk/CMake/FindTeem.cmake  Wed Oct 31 14:25:22 2007
@@ -12,9 +12,9 @@
 # 
 # The following relevant variables are introduced by this script:
 #
-# TEEM_LIBRARY_DIRS -- Teem library directory.
-# TEEM_LIBRARIES    -- Names of compiled libraries.
-# TEEM_INCLUDE_DIRS -- Include directory.
+# TEEM_LIBRARY_DIRS -- Teem library directory. (from TEEMConfig)
+# TEEM_LIBRARY      -- Path to Teem library    (local)
+# TEEM_INCLUDE_DIRS -- Include directory.      (from TEEMConfig)
 #
 # Note that this script does not include the TEEMUse.cmake script which 
 # appears to modify the global compiler and linker command line options.
@@ -45,12 +45,15 @@
     SET(FOUND_TEEM  TRUE)
 
     # Add the include directory to the build
-    INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
-    LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
+    #INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+
+    # Find the library :)
+    FIND_LIBRARY(TEEM_LIBRARY teem ${TEEM_LIBRARY_DIRS})
+    #    LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
 
   ELSE (FOUND_TEEMCONFIG_CMAKE)
     # Warn about version.
-    MESSAGE("TEEMConfig.cmake not found. Are you using Teem 1.9 source 
distribution?")
+    MESSAGE("TEEMConfig.cmake not found. Are you using Teem 1.10 source 
distribution?")
   ENDIF (FOUND_TEEMCONFIG_CMAKE)
 
   MARK_AS_ADVANCED(FOUND_TEEMCONFIG_CMAKE)

Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt  (original)
+++ trunk/Image/CMakeLists.txt  Wed Oct 31 14:25:22 2007
@@ -3,11 +3,10 @@
 
###############################################################################
 # Check to see if nrrd dependent files should be included.
 IF (FOUND_TEEM) 
-
+  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${TEEM_LIBRARY_DIRS})
   # Add the Nrrd read/write files to the build
   SET (NRRD_IMAGE_SRC NRRDFile.h NRRDFile.cc)  
-  SET (NRRD_IMAGE_LIB teem)
-
 ELSE (FOUND_TEEM)
   # Add stubs for these functions
   SET (NRRD_IMAGE_SRC NRRDFile.h NRRDFile-stub.cc)  
@@ -33,11 +32,11 @@
 ADD_LIBRARY (Manta_Image 
              NullImage.cc
              NullImage.h
-            PPMFile.cc
-            PPMFile.h
+             PPMFile.cc
+             PPMFile.h
              Pixel.h
-            RGBEFile.cc
-            RGBEFile.h
+             RGBEFile.cc
+             RGBEFile.h
              SimpleImageBase.h
              SimpleImageBase.cc
              SimpleImage.h
@@ -53,12 +52,13 @@
                       Manta_Interface 
                       Manta_Core
                       SCIRun_Core 
-  ${NRRD_IMAGE_LIB}
-  )
+                      )
 
+# Link against optional libraries
 IF (ImageMagickPP_FOUND)
-  # Add the ImageMagick libraries
   TARGET_LINK_LIBRARIES(Manta_Image ${ImageMagickPP_LIB})
 ENDIF(ImageMagickPP_FOUND)
 
-                    
+IF(FOUND_TEEM)
+  TARGET_LINK_LIBRARIES(Manta_Image ${TEEM_LIBRARY})
+ENDIF(FOUND_TEEM)

Modified: trunk/Model/CMakeLists.txt
==============================================================================
--- trunk/Model/CMakeLists.txt  (original)
+++ trunk/Model/CMakeLists.txt  Wed Oct 31 14:25:22 2007
@@ -30,5 +30,10 @@
              ${Manta_Textures_SRCS}
              )
 
-TARGET_LINK_LIBRARIES(Manta_Model Manta_Image Manta_Interface Manta_Core)
+TARGET_LINK_LIBRARIES(Manta_Model
+  Manta_Image
+  Manta_Interface
+  Manta_Core
+  ${Manta_Model_extra_libs}
+  )
 

Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Wed Oct 31 14:25:22 2007
@@ -39,5 +39,10 @@
     Materials/Volume.h
     Materials/Volume.cc
     )
+  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+  LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
+  SET(Manta_Model_extra_libs ${Manta_Model_extra_libs}
+    ${TEEM_LIBRARY}
+    )
 ENDIF(FOUND_TEEM AND MANTA_SSE)
 

Modified: trunk/Model/Readers/CMakeLists.txt
==============================================================================
--- trunk/Model/Readers/CMakeLists.txt  (original)
+++ trunk/Model/Readers/CMakeLists.txt  Wed Oct 31 14:25:22 2007
@@ -22,5 +22,6 @@
        Readers/ParticleNRRD.h
        Readers/ParticleNRRD.cc
    )
-   INCLUDE_DIRECTORIES(${FOUND_TEEM_INCLUDE})
+   INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+   LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
 ENDIF(BUILD_NRRDPARTICLES)

Modified: trunk/Model/Readers/ParticleNRRD.h
==============================================================================
--- trunk/Model/Readers/ParticleNRRD.h  (original)
+++ trunk/Model/Readers/ParticleNRRD.h  Wed Oct 31 14:25:22 2007
@@ -20,9 +20,9 @@
     void readFile(string const& filename);
 
   private:
+    float* pdata;
     unsigned int nvars;
     unsigned int nparticles;
-    float* pdata;
     bool nuke;
   };
 }

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Wed Oct 31 14:25:22 2007
@@ -57,6 +57,7 @@
 IF(FOUND_TEEM AND MANTA_SSE)
 SET(SCENE_VOLUMETEST 0 CACHE BOOL "volume test")
 IF(SCENE_VOLUMETEST)
+   INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
    ADD_LIBRARY(scene_volumeTest volumeTest.cc)
    TARGET_LINK_LIBRARIES(scene_volumeTest ${MANTA_SCENE_LINK})
 ENDIF(SCENE_VOLUMETEST)

Modified: trunk/tests/NoSSETest.cmake
==============================================================================
--- trunk/tests/NoSSETest.cmake (original)
+++ trunk/tests/NoSSETest.cmake Wed Oct 31 14:25:22 2007
@@ -20,10 +20,11 @@
   SCENE_GRIDISOVOL:BOOL=ON
   SCENE_OCTISOVOL:BOOL=ON
   SCENE_VORPAL:BOOL=ON
+  SCENE_VOLUMETEST:BOOL=ON
   BUILD_SWIG_INTERFACE:BOOL=ON
+  BUILD_TESTING:BOOL=ON
   MANTA_SSE:BOOL=OFF
   MANTA_SSE_GCC:BOOL=OFF
-  BUILD_TESTING:BOOL=ON
 ")
 
 # SITE:STRING=cibc-rd1.sci.utah.edu

Modified: trunk/tests/SSETest.cmake
==============================================================================
--- trunk/tests/SSETest.cmake   (original)
+++ trunk/tests/SSETest.cmake   Wed Oct 31 14:25:22 2007
@@ -20,9 +20,10 @@
   SCENE_GRIDISOVOL:BOOL=ON
   SCENE_OCTISOVOL:BOOL=ON
   SCENE_VORPAL:BOOL=ON
+  SCENE_VOLUMETEST:BOOL=ON
   BUILD_SWIG_INTERFACE:BOOL=ON
-  MANTA_SSE:BOOL=ON
   BUILD_TESTING:BOOL=ON
+  MANTA_SSE:BOOL=ON
 ")
 
 # SITE:STRING=cibc-rd1.sci.utah.edu

---

• [Manta] r1797 - in trunk: CMake Image Model Model/Materials Model/Readers scenes tests, bigler, 10/31/2007

---

Archive powered by MHonArc 2.6.16.