Text archives Help

---

Author: bigler
Date: Tue Oct 30 17:00:00 2007
New Revision: 1794

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

  Made Carson's stuff build-dependent on SSE being enabled since he
  didn't make use of MANTA_SSE.  Not only that, but it needs to add
  include paths for teem to the source files.


Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Tue Oct 30 17:00:00 2007
@@ -33,41 +33,11 @@
      Materials/Transparent.h
      )
 
-IF(FOUND_TEEM)
-SET (Manta_Materials_SRCS
-     Materials/Volume.h
-     Materials/Volume.cc
-     Materials/AmbientOcclusion.h
-     Materials/AmbientOcclusion.cc
-     Materials/Checker.h
-     Materials/Checker.cc
-     Materials/CopyTextureMaterial.cc
-     Materials/CopyTextureMaterial.h
-     Materials/Dielectric.h
-     Materials/Dielectric.cc
-     Materials/Flat.h
-     Materials/Flat.cc
-     Materials/Lambertian.h
-     Materials/Lambertian.cc
-     Materials/OrenNayar.h
-     Materials/OrenNayar.cc
-     Materials/LitMaterial.h
-     Materials/LitMaterial.cc
-     Materials/MaterialTable.h
-     Materials/MaterialTable.cc
-     Materials/MetalMaterial.h
-     Materials/MetalMaterial.cc
-     Materials/NDotL.h
-     Materials/NDotL.cc
-     Materials/NullMaterial.h
-     Materials/OpaqueShadower.h
-     Materials/OpaqueShadower.cc
-     Materials/Phong.h
-     Materials/Phong.cc
-     Materials/ThinDielectric.h
-     Materials/ThinDielectric.cc
-     Materials/Transparent.cc
-     Materials/Transparent.h
-     )
-ENDIF(FOUND_TEEM)
+IF(FOUND_TEEM AND MANTA_SSE)
+  SET (Manta_Materials_SRCS
+    ${Manta_Materials_SRCS}
+    Materials/Volume.h
+    Materials/Volume.cc
+    )
+ENDIF(FOUND_TEEM AND MANTA_SSE)
 

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Tue Oct 30 17:00:00 2007
@@ -54,13 +54,13 @@
    TARGET_LINK_LIBRARIES(scene_fence ${MANTA_SCENE_LINK})
 ENDIF(SCENE_FENCE)
 
-IF(FOUND_TEEM)
+IF(FOUND_TEEM AND MANTA_SSE)
 SET(SCENE_VOLUMETEST 0 CACHE BOOL "volume test")
 IF(SCENE_VOLUMETEST)
    ADD_LIBRARY(scene_volumeTest volumeTest.cc)
    TARGET_LINK_LIBRARIES(scene_volumeTest ${MANTA_SCENE_LINK})
 ENDIF(SCENE_VOLUMETEST)
-ENDIF(FOUND_TEEM)
+ENDIF(FOUND_TEEM AND MANTA_SSE)
 
 # octree isosurface
 SET(SCENE_OCTISOVOL 0 CACHE BOOL "octree isosurface")

---

• [Manta] r1794 - in trunk: Model/Materials scenes, bigler, 10/30/2007

---

Archive powered by MHonArc 2.6.16.