Text archives Help

---

Author: bigler
Date: Mon Feb 11 16:06:59 2008
New Revision: 2049

Modified:
   trunk/Image/CMakeLists.txt
   trunk/include/MachineParameters.h.CmakeTemplate
Log:
Image/CMakeLists.txt

  If you are on a mac, use only CoreGraphics.  Otherwise look for
  ImageMagick++ and OpenEXR.

include/MachineParameters.h.CmakeTemplate

  This define was done wrong.  #define XYZ 0 will still make #ifdef
  XYZ true.  I'm following the exising conventions for Manta
  definitions.


Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt  (original)
+++ trunk/Image/CMakeLists.txt  Mon Feb 11 16:06:59 2008
@@ -13,41 +13,33 @@
 ENDIF (FOUND_TEEM)
 
 
###############################################################################
-# Locate ImageMagick++
-INCLUDE (${CMAKE_SOURCE_DIR}/CMake/FindImageMagick++.cmake)
-
-IF (ImageMagickPP_FOUND)
-  # Add the ImageMagick files
-  SET (ImageMagick_SRC ImageMagickFile.h ImageMagickFile.cc)
-  INCLUDE_DIRECTORIES(${ImageMagickPP_Include_Dir})
-  GET_SOURCE_FILE_PROPERTY(prop ImageMagickFile.cc COMPILE_FLAGS)
-#  SET_SOURCE_FILES_PROPERTIES(ImageMagickFile.cc
-#                              PROPERTIES INCLUDE_DIRECTORIES 
${ImageMagickPP_Include_Dir})
-ELSE(ImageMagickPP_FOUND)
-  SET (ImageMagick_SRC ImageMagickFile.h ImageMagickFile-stub.cc)
-ENDIF(ImageMagickPP_FOUND)
-
-###############################################################################
-# Locate CoreGraphics
+# Locate Image loading libraries.  On Apple we look for CoreGrahics.
+# On other systems we look for ImageMagick++.
 IF(APPLE)
-  SET(MANTA_USE_COREGRAPHICS ON CACHE BOOL "Enable CoreGraphics support")
-
-  FIND_LIBRARY(COREGRAPHICS_FRAMEWORK ApplicationServices)
-
-  IF(MANTA_USE_COREGRAPHICS)
-    SET(CoreGraphics_SRC CoreGraphicsFile.h CoreGraphicsFile.cc)
-  ELSE(MANTA_USE_COREGRAPHICS)
-    SET(CoreGraphics_SRC CoreGraphicsFile.h CoreGraphicsFile-stub.cc)
-  ENDIF(MANTA_USE_COREGRAPHICS)
+  # Locate CoreGraphics
+  FIND_LIBRARY(COREGRAPHICS_FRAMEWORK ApplicationServices REQUIRED)
 
+  SET (CoreGraphics_SRC CoreGraphicsFile.h CoreGraphicsFile.cc)
+  SET (ImageMagick_SRC ImageMagickFile.h ImageMagickFile-stub.cc)
+  SET (EXR_SRC EXRFile.h EXRFile-stub.cc)
 ELSE(APPLE)
-  SET(CoreGraphics_SRC CoreGraphicsFile.h CoreGraphicsFile-stub.cc)
-ENDIF(APPLE)
+  # Non APPLE systems
+  SET (CoreGraphics_SRC CoreGraphicsFile.h CoreGraphicsFile-stub.cc)
 
+  #############################################
+  # Look for ImageMagick++
+  INCLUDE (${CMAKE_SOURCE_DIR}/CMake/FindImageMagick++.cmake)
+
+  IF (ImageMagickPP_FOUND)
+    # Add the ImageMagick files
+    SET (ImageMagick_SRC ImageMagickFile.h ImageMagickFile.cc)
+    INCLUDE_DIRECTORIES(${ImageMagickPP_Include_Dir})
+  ELSE(ImageMagickPP_FOUND)
+    SET (ImageMagick_SRC ImageMagickFile.h ImageMagickFile-stub.cc)
+  ENDIF(ImageMagickPP_FOUND)
 
-###############################################################################
-# Locate OpenEXR
-IF(NOT APPLE)
+  #############################################
+  # Locate OpenEXR
   INCLUDE (${CMAKE_SOURCE_DIR}/CMake/FindOpenEXR.cmake)
 
   IF (OpenEXR_FOUND)
@@ -57,11 +49,7 @@
   ELSE(OpenEXR_FOUND)
     SET (EXR_SRC EXRFile.h EXRFile-stub.cc)
   ENDIF(OpenEXR_FOUND)
-ELSE(NOT APPLE)
-  SET (EXR_SRC EXRFile.h EXRFile-stub.cc)
-ENDIF(NOT APPLE)
-
-
+ENDIF(APPLE)
 
 
###############################################################################
 # Create the library

Modified: trunk/include/MachineParameters.h.CmakeTemplate
==============================================================================
--- trunk/include/MachineParameters.h.CmakeTemplate     (original)
+++ trunk/include/MachineParameters.h.CmakeTemplate     Mon Feb 11 16:06:59 
2008
@@ -29,6 +29,8 @@
 #ifndef MANTA_INCLUDE_MACHINE_PARAMETERS_H_
 #define MANTA_INCLUDE_MACHINE_PARAMETERS_H_
 
-#define MANTA_X86 ${MANTA_X86_DEF}
+#if ${MANTA_X86_DEF}
+#  define MANTA_X86 1
+#endif
 
 #endif

---

• [Manta] r2049 - in trunk: Image include, James Bigler, 02/11/2008

---

Archive powered by MHonArc 2.6.16.