Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1891 - in trunk: . CMake
- Date: Fri, 30 Nov 2007 13:17:14 -0700 (MST)
Author: bigler
Date: Fri Nov 30 13:17:13 2007
New Revision: 1891
Modified:
trunk/CMake/CompilerInfo.cmake
trunk/CMake/ConfigCompilerFlags.cmake
trunk/CMakeLists.txt
Log:
CMake/CompilerInfo.cmake
CMake/ConfigCompilerFlags.cmake
CMakeLists.txt
Austin convinced me that using CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in
CMake/*.cmake was a bad idea, because other projects will break if
they also don't use this option. I'll revisit this another day.
Modified: trunk/CMake/CompilerInfo.cmake
==============================================================================
--- trunk/CMake/CompilerInfo.cmake (original)
+++ trunk/CMake/CompilerInfo.cmake Fri Nov 30 13:17:13 2007
@@ -47,7 +47,8 @@
SET(USING_WINDOWS_CL TRUE)
# We should set this macro as well to get our nice trig functions
ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
-ENDIF()
+ENDIF(CMAKE_C_COMPILER MATCHES ${MANTA_COMPILER_NAME_REGEXPR}
+ AND CMAKE_CXX_COMPILER MATCHES ${MANTA_COMPILER_NAME_REGEXPR})
# Do some error checking
# Mixing compilers
@@ -66,11 +67,11 @@
# Using unknown compilers
IF (NOT USING_ICC AND NOT USING_GCC AND NOT USING_WINDOWS_CL)
FIRST_TIME_MESSAGE("Specified C compiler ${CMAKE_C_COMPILER} is not
recognized (gcc, icc). Using CMake defaults.")
-ENDIF()
+ENDIF(NOT USING_ICC AND NOT USING_GCC AND NOT USING_WINDOWS_CL)
IF (NOT USING_ICPC AND NOT USING_GPP AND NOT USING_WINDOWS_CL)
FIRST_TIME_MESSAGE("Specified CXX compiler ${CMAKE_CXX_COMPILER} is not
recognized (g++, icpc). Using CMake defaults.")
-ENDIF()
+ENDIF(NOT USING_ICPC AND NOT USING_GPP AND NOT USING_WINDOWS_CL)
# Warn if the compiler is not icc on SGI_LINUX systems
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
Modified: trunk/CMake/ConfigCompilerFlags.cmake
==============================================================================
--- trunk/CMake/ConfigCompilerFlags.cmake (original)
+++ trunk/CMake/ConfigCompilerFlags.cmake Fri Nov 30 13:17:13 2007
@@ -104,7 +104,7 @@
IF (USING_WINDOWS_CL)
APPEND_TO_STRING(C_FLAGS ${WARNING_FLAGS})
APPEND_TO_STRING(CXX_FLAGS ${WARNING_FLAGS})
-ENDIF()
+ENDIF(USING_WINDOWS_CL)
##############################################################
## IA64
Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Fri Nov 30 13:17:13 2007
@@ -12,8 +12,6 @@
PROJECT (Manta)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
-
INCLUDE(CTest)
IF(BUILD_TESTING)
ENABLE_TESTING()
@@ -36,8 +34,6 @@
# make VERBOSE=1
SET(CMAKE_VERBOSE_MAKEFILE OFF)
-
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
############################################################
# Set default search directory prefixes for third party libraries.
- [Manta] r1891 - in trunk: . CMake, bigler, 11/30/2007
Archive powered by MHonArc 2.6.16.