Text archives Help

---

Author: abe
Date: Mon Jul 17 19:45:24 2006
New Revision: 1143

Modified:
   trunk/CMakeLists.txt
   trunk/Model/Groups/CMakeLists.txt
   trunk/SCIRun/include/sci_defs/CMakeLists.txt
   trunk/include/CMakeLists.txt
Log:


Switched CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR. This
eliminiates the necessity for absolute paths in CONFIGURE_FILE
directives and permits Manta (and SCIRun) to be more easily included
in a third party build.

M    include/CMakeLists.txt
M    Model/Groups/CMakeLists.txt
M    SCIRun/include/sci_defs/CMakeLists.txt

Added conditional based on apple processor for cxx flags.
M    CMakeLists.txt


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Mon Jul 17 19:45:24 2006
@@ -164,8 +164,25 @@
 ######################################################################
 # Check for Mac OS
 IF (APPLE)
-  #FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-DSCI_ASSERTION_LEVEL=0 -O3 -g 
-fgcse-sm -funroll-loops -fstrict-aliasing -fsched-interblock 
-falign-loops=16 -falign-jumps=16 -falign-functions=16 
-falign-jumps-max-skip=15 -falign-loops-max-skip=15 -ffast-math 
-freorder-blocks -mpowerpc-gpopt -force_cpusubtype_ALL -mtune=G5 -mcpu=G5 
-mpowerpc64 -faltivec -mabi=altivec -mpowerpc-gfxopt" STRING "Optimized 
Flags")
-  FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-DSCI_ASSERTION_LEVEL=0 -fgcse-sm 
-funroll-loops -fstrict-aliasing -fsched-interblock -ffast-math 
-freorder-blocks -fpermissive -march=prescott -mtune=prescott -msse -msse2 
-msse3 -mfpmath=sse" STRING "Optimized Flags")
+
+  # Obtain output of /usr/bin/macine
+  EXEC_PROGRAM("/usr/bin/machine" OUTPUT_VARIABLE APPLE_MACHINE)
+
+  # G4 Powerbook.
+  IF (${APPLE_MACHINE} MATCHES "ppc7450")
+     FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-DSCI_ASSERTION_LEVEL=0 -O3 -g 
-fgcse-sm -funroll-loops -fstrict-aliasing -fsched-interblock 
-falign-loops=16 -falign-jumps=16 -falign-functions=16 
-falign-jumps-max-skip=15 -falign-loops-max-skip=15 -ffast-math 
-freorder-blocks -mpowerpc-gpopt -force_cpusubtype_ALL -mtune=G4 -mcpu=G4 
-faltivec -mabi=altivec -mpowerpc-gfxopt" STRING "G4 Optimized Flags")
+  ENDIF (${APPLE_MACHINE} MATCHES "ppc7450")
+
+  # G5 Workstation.
+  IF (${APPLE_MACHINE} STREQUAL "ppc970")
+     FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-DSCI_ASSERTION_LEVEL=0 -O3 -g 
-fgcse-sm -funroll-loops -fstrict-aliasing -fsched-interblock 
-falign-loops=16 -falign-jumps=16 -falign-functions=16 
-falign-jumps-max-skip=15 -falign-loops-max-skip=15 -ffast-math 
-freorder-blocks -mpowerpc-gpopt -force_cpusubtype_ALL -mtune=G5 -mcpu=G5 
-mpowerpc64 -faltivec -mabi=altivec -mpowerpc-gfxopt" STRING "G5 Optimized 
Flags")
+  ENDIF(${APPLE_MACHINE} STREQUAL "ppc970")
+
+  # Core Duo.  
+  IF (${APPLE_MACHINE} STREQUAL "i486") # ???
+     FIRST_TIME_SET(CMAKE_CXX_FLAGS_RELEASE "-DSCI_ASSERTION_LEVEL=0 
-fgcse-sm -funroll-loops -fstrict-aliasing -fsched-interblock -ffast-math 
-freorder-blocks -fpermissive -march=prescott -mtune=prescott -msse -msse2 
-msse3 -mfpmath=sse" STRING "Core Duo Optimized Flags")
+  ENDIF (${APPLE_MACHINE} STREQUAL "i486")
+
 ENDIF (APPLE)
 
 ##################################################################
@@ -222,9 +239,9 @@
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "Single 
output directory for building all libraries.")
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "Single 
output directory for building all executables.")
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} 
-                    ${CMAKE_SOURCE_DIR}/SCIRun 
-                    ${CMAKE_SOURCE_DIR}/SCIRun/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} 
+                    ${CMAKE_CURRENT_SOURCE_DIR}/SCIRun 
+                    ${CMAKE_CURRENT_SOURCE_DIR}/SCIRun/include)
 SET(MAIN_SUBDIRS
   SCIRun/Core
   SCIRun/include/sci_defs

Modified: trunk/Model/Groups/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/CMakeLists.txt   (original)
+++ trunk/Model/Groups/CMakeLists.txt   Mon Jul 17 19:45:24 2006
@@ -2,7 +2,7 @@
 # Configure the parameters for the KDTrees
 SET(MANTA_TRAVERSALPACKET_SIZE 4 CACHE STRING "Size to use for vertical 
kdtree traversal packets.")
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/Model/Groups/KdtreeParameters.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/Groups/KdtreeParameters.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/KdtreeParameters.h
   )
   

Modified: trunk/SCIRun/include/sci_defs/CMakeLists.txt
==============================================================================
--- trunk/SCIRun/include/sci_defs/CMakeLists.txt        (original)
+++ trunk/SCIRun/include/sci_defs/CMakeLists.txt        Mon Jul 17 19:45:24 
2006
@@ -12,7 +12,7 @@
 ENDIF(NOT UNHANDLED_EXCEPTIONS_CAUGHT)
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/SCIRun/include/sci_defs/error_defs.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/error_defs.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/sci_defs/error_defs.h
   )
 

Modified: trunk/include/CMakeLists.txt
==============================================================================
--- trunk/include/CMakeLists.txt        (original)
+++ trunk/include/CMakeLists.txt        Mon Jul 17 19:45:24 2006
@@ -15,7 +15,7 @@
 SET(MANTA_COLOR_COMPONENT float CACHE STRING "Typedef for ColorComponent")
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/include/MantaTypes.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/MantaTypes.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/MantaTypes.h
   )
 
@@ -25,7 +25,7 @@
 SET(MANTA_SCRATCHPAD_MAXSIZE 128 CACHE STRING "Static Scratchpad size.")
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/include/RayPacketParameters.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/RayPacketParameters.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/RayPacketParameters.h
   )
 
@@ -34,7 +34,7 @@
 SET(MANTA_FRAGMENT_MAXSIZE  32 CACHE STRING "Static Fragment size.")
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/include/FragmentParameters.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/FragmentParameters.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/FragmentParameters.h
   )
 
@@ -48,7 +48,7 @@
 ENDIF(MANTA_SSE)
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/include/MantaSSE.h.CMakeTemplate
+  ${CMAKE_CURRENT_SOURCE_DIR}/MantaSSE.h.CMakeTemplate
   ${CMAKE_BINARY_DIR}/include/MantaSSE.h
   )
 

---

• [MANTA] r1143 - in trunk: . Model/Groups SCIRun/include/sci_defs include, abe, 07/17/2006

---

Archive powered by MHonArc 2.6.16.