Text archives Help

---

Author: abe
Date: Sat Jun  2 00:10:03 2007
New Revision: 1407

Modified:
   trunk/CMake/ConfigCompilerFlags.cmake
   trunk/CMake/ConfigureAbout.cmake.CMakeTemplate
   trunk/CMake/LinuxCPUInfo.cmake
Log:


Added detection for kentsfield, fixed bug which caused cmake script
errors if processors/compiler combination isn't included in the
script.
M    CMake/ConfigCompilerFlags.cmake
M    CMake/LinuxCPUInfo.cmake

Added compiler to about output.
M    CMake/ConfigureAbout.cmake.CMakeTemplate


Modified: trunk/CMake/ConfigCompilerFlags.cmake
==============================================================================
--- trunk/CMake/ConfigCompilerFlags.cmake       (original)
+++ trunk/CMake/ConfigCompilerFlags.cmake       Sat Jun  2 00:10:03 2007
@@ -51,6 +51,9 @@
 SET(CXX_FLAGS_DEBUG "")
 SET(CXX_FLAGS_RELEASE "")
 
+SET(INTEL_OPT " ")
+SET(GCC_OPT " ")
+
 # Set the default warning levels for each compiler
 
 ####################
@@ -127,18 +130,31 @@
 
   INCLUDE(${CMAKE_SOURCE_DIR}/CMake/LinuxCPUInfo.cmake)
 
+  # AMD
   IF(VENDOR_ID MATCHES "AuthenticAMD")
     APPEND_TO_STRING(GCC_ARCH "opteron") # supports 64 bit instructions
     APPEND_TO_STRING(GCC_ARCH "athlon-xp") # no support for 64 bit 
instructions
     APPEND_TO_STRING(INTEL_OPT "-xW -unroll4")
   ENDIF(VENDOR_ID MATCHES "AuthenticAMD")
+
+  # Intel
   IF(VENDOR_ID MATCHES "GenuineIntel")
+
     IF(CPU_FAMILY EQUAL 6)
+
       IF(MODEL EQUAL 15) # (F)
+
         # This is likely a Core 2
+        APPEND_TO_STRING(GCC_ARCH "kentsfield") # QX6700
         APPEND_TO_STRING(GCC_ARCH "nocona")
         APPEND_TO_STRING(GCC_ARCH "prescott")
+
+        # -xT  Intel(R) Core(TM)2 Duo processors, Intel(R) Core(TM)2 Quad
+        # processors, and Intel(R) Xeon(R) processors with SSSE3
+        APPEND_TO_STRING(INTEL_OPT "-xT -unroll4")
+
       ENDIF(MODEL EQUAL 15)
+
       IF(MODEL EQUAL 14) # (E)
         # This is likely a Core Single or Core Duo.  This doesn't
         # support EM64T.
@@ -217,7 +233,6 @@
 #   MESSAGE("GOOD_ARCH = ${GOOD_ARCH}")
 ENDIF(USING_GCC OR USING_GPP AND NOT PASSED_FIRST_CONFIGURE)
 
-
 # MESSAGE("CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}")
 # MESSAGE("APPLE = ${APPLE}")
 # MESSAGE("LINUX = ${LINUX}")
@@ -252,3 +267,6 @@
 SET_FLAGS(CMAKE_CXX_FLAGS         CXX_FLAGS)
 SET_FLAGS(CMAKE_CXX_FLAGS_DEBUG   CXX_FLAGS_DEBUG)
 SET_FLAGS(CMAKE_CXX_FLAGS_RELEASE CXX_FLAGS_RELEASE)
+
+
+

Modified: trunk/CMake/ConfigureAbout.cmake.CMakeTemplate
==============================================================================
--- trunk/CMake/ConfigureAbout.cmake.CMakeTemplate      (original)
+++ trunk/CMake/ConfigureAbout.cmake.CMakeTemplate      Sat Jun  2 00:10:03 
2007
@@ -12,7 +12,11 @@
 STRING(REGEX REPLACE "\n" "\\\\n" SVN_OUTPUT ${SVN_OUTPUT})
 
 # Set the about string.
-SET(ABOUT_STRING ${SVN_OUTPUT} "\\n\\nBuild Type: " @CMAKE_BUILD_TYPE@)
+SET(ABOUT_STRING ${SVN_OUTPUT} 
+  "\\n\\n"
+  "Build Type: " @CMAKE_BUILD_TYPE@ "\\n"
+  "Compiler:   " @CMAKE_CXX_COMPILER@ "\\n"
+  )
 
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 

Modified: trunk/CMake/LinuxCPUInfo.cmake
==============================================================================
--- trunk/CMake/LinuxCPUInfo.cmake      (original)
+++ trunk/CMake/LinuxCPUInfo.cmake      Sat Jun  2 00:10:03 2007
@@ -5,21 +5,26 @@
   SET(VENDOR_ID_RX "vendor_id[ \t]*:[ \t]*([a-zA-Z]+)\n")
   STRING(REGEX MATCH "${VENDOR_ID_RX}" VENDOR_ID "${PROC_CPUINFO}")
   STRING(REGEX REPLACE "${VENDOR_ID_RX}" "\\1" VENDOR_ID "${VENDOR_ID}")
-#  MESSAGE(STATUS "VENDOR_ID : ${VENDOR_ID}")
 
   SET(CPU_FAMILY_RX "cpu family[ \t]*:[ \t]*([0-9]+)")
   STRING(REGEX MATCH "${CPU_FAMILY_RX}" CPU_FAMILY "${PROC_CPUINFO}")
   STRING(REGEX REPLACE "${CPU_FAMILY_RX}" "\\1" CPU_FAMILY "${CPU_FAMILY}")
-#  MESSAGE(STATUS "CPU_FAMILY : ${CPU_FAMILY}")
 
   SET(MODEL_RX "model[ \t]*:[ \t]*([0-9]+)")
   STRING(REGEX MATCH "${MODEL_RX}" MODEL "${PROC_CPUINFO}")
   STRING(REGEX REPLACE "${MODEL_RX}" "\\1" MODEL "${MODEL}")
-#  MESSAGE(STATUS "MODEL : ${MODEL}")
 
   SET(FLAGS_RX "flags[ \t]*:[ \t]*([a-zA-Z0-9 _]+)\n")
   STRING(REGEX MATCH "${FLAGS_RX}" FLAGS "${PROC_CPUINFO}")
   STRING(REGEX REPLACE "${FLAGS_RX}" "\\1" FLAGS "${FLAGS}")
-#  MESSAGE(STATUS "FLAGS : ${FLAGS}")
+
+  # Debug output.
+  IF(LINUX_CPUINFO)
+    MESSAGE(STATUS "LinuxCPUInfo.cmake:")
+    MESSAGE(STATUS "VENDOR_ID : ${VENDOR_ID}")
+    MESSAGE(STATUS "CPU_FAMILY : ${CPU_FAMILY}")
+    MESSAGE(STATUS "MODEL : ${MODEL}")
+    MESSAGE(STATUS "FLAGS : ${FLAGS}")
+  ENDIF(LINUX_CPUINFO)
 
 ENDIF(EXISTS "/proc/cpuinfo")

---

• [MANTA] r1407 - trunk/CMake, abe, 06/02/2007

---

Archive powered by MHonArc 2.6.16.