[cig-commits] r11257 - in cs/benchmark/cigma/trunk/scratch/cg: . CMake

[luis at geodynamics.org]

Author: luis
Date: 2008-02-26 04:52:14 -0800 (Tue, 26 Feb 2008)
New Revision: 11257

Modified:
   cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake
   cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt
Log:
Updated cmake build scripts


Modified: cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake	2008-02-26 12:52:12 UTC (rev 11256)
+++ cs/benchmark/cigma/trunk/scratch/cg/CMake/FindCigma.cmake	2008-02-26 12:52:14 UTC (rev 11257)
@@ -3,14 +3,14 @@
 #
 #
 
-FIND_PATH(CIGMA_INCLUDE_DIR h5io.h
-    $ENV{CIGMA_HOME}/h5io
+FIND_PATH(CIGMA_INCLUDE_DIR CompareCmd.h
+    $ENV{CIGMA_HOME}/src
     /usr/local/include
     /usr/include
 )
 
-FIND_LIBRARY(CIGMA_LIBRARY h5io
-    $ENV{CIGMA_HOME}/lib
+FIND_LIBRARY(CIGMA_LIBRARY cigma
+    $ENV{CIGMA_HOME}/src
     /usr/local/lib
     /usr/lib
 )

Modified: cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt	2008-02-26 12:52:12 UTC (rev 11256)
+++ cs/benchmark/cigma/trunk/scratch/cg/CMakeLists.txt	2008-02-26 12:52:14 UTC (rev 11257)
@@ -45,6 +45,17 @@
 
 
 # ----------------------------------------------------------------------------
+# Configure Cigma
+INCLUDE(${cg_SOURCE_DIR}/CMake/FindCigma.cmake)
+
+
+# ----------------------------------------------------------------------------
+# Configure HDF5
+INCLUDE(${cg_SOURCE_DIR}/CMake/FindHDF5.cmake)
+INCLUDE(${cg_SOURCE_DIR}/CMake/FindZLIB.cmake)
+
+
+# ----------------------------------------------------------------------------
 # Configure VTK
 FIND_PACKAGE(VTK REQUIRED)
 INCLUDE(${VTK_USE_FILE})