Text archives Help

---

Author: abe
Date: Fri Nov  9 04:51:40 2007
New Revision: 1840

Modified:
   trunk/Model/Materials/CMakeLists.txt
   trunk/Model/Readers/CMakeLists.txt
Log:

Added teem to the include directories for Model/Materials (when the
package is available)--Volume.cc depends on it indirectly through
Readers/VolumeNRRD.h. Previously this broke the build if teem was
available.

M    Model/Materials/CMakeLists.txt
M    Model/Readers/CMakeLists.txt


Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Fri Nov  9 04:51:40 2007
@@ -33,11 +33,15 @@
      Materials/Transparent.h
      )
 
-IF(MANTA_SSE)
+IF(MANTA_SSE AND FOUND_TEEM_BIN)
+             
+  # Needed by Readers/VolumeNRRD.h a dependency of Volume.h
+  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+
   SET (Manta_Materials_SRCS
     ${Manta_Materials_SRCS}
     Materials/Volume.h
     Materials/Volume.cc
   )
-ENDIF(MANTA_SSE)
+ENDIF(MANTA_SSE AND FOUND_TEEM_BIN)
 

Modified: trunk/Model/Readers/CMakeLists.txt
==============================================================================
--- trunk/Model/Readers/CMakeLists.txt  (original)
+++ trunk/Model/Readers/CMakeLists.txt  Fri Nov  9 04:51:40 2007
@@ -7,10 +7,8 @@
   Readers/PlyReader.cc
   Readers/V3C1.h
   Readers/V3C1.cc
-  Readers/VolumeNRRD.h
   )
 
-
 # Apple places malloc.h in /usr/include/malloc/malloc.h
 IF (APPLE)
   INCLUDE_DIRECTORIES(/usr/include/malloc/)
@@ -24,6 +22,7 @@
     Readers/ParticleNRRD.cc
     )
   INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+
   SET(Manta_Model_extra_libs ${Manta_Model_extra_libs}
     ${TEEM_LIBRARY}                                   
     )

---

• [Manta] r1840 - in trunk/Model: Materials Readers, abe, 11/09/2007

---

Archive powered by MHonArc 2.6.16.