Text archives Help
- From: "James Bigler" <bigler@cs.utah.edu>
- To: manta@sci.utah.edu
- Subject: [Manta] r2273 - in trunk: . Core
- Date: Wed, 28 May 2008 08:18:17 -0600 (MDT)
Author: bigler
Date: Wed May 28 08:18:16 2008
New Revision: 2273
Modified:
trunk/CMakeLists.txt
trunk/Core/CMakeLists.txt
Log:
CMakeLists.txt
Some updates to quiet warnings when using CMake 2.6.
Core/CMakeLists.txt
Removed trailing spaces.
Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Wed May 28 08:18:16 2008
@@ -5,10 +5,17 @@
###############################################################################
###############################################################################
-# # You need at least CMake version 2.0
-# IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.0)
-# MESSAGE(FATAL_ERROR "You need at least version 2.0. Go get it from
http://www.cmake.org/HTML/Download.html")
-# ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.0)
+# You need at least CMake version 2.4
+cmake_minimum_required(VERSION 2.4)
+
+# As of CMake 2.6 Policies were introduced in order to provide a mechanism
for
+# adding backwards compatibility one feature at a time.
+
+# Run cmake --help-policy CMP<num> to see documentation.
+if(COMMAND cmake_policy)
+ # Library paths (/path/to/libmy.so not translated to -L/path/to -lmy)
+ cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
PROJECT (Manta)
Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt (original)
+++ trunk/Core/CMakeLists.txt Wed May 28 08:18:16 2008
@@ -107,19 +107,19 @@
# Sources of Core/Thread classes
SET(CORE_SOURCES ${CORE_SOURCES}
- Thread/CleanupManager.cc
- Thread/Guard.cc
- Thread/MutexPool.cc
- Thread/ParallelBase.cc
- Thread/Runnable.cc
- Thread/Thread.cc
- Thread/ThreadError.cc
- Thread/SimpleReducer.cc
- Thread/ThreadLock.cc
- Thread/ThreadGroup.cc
- Thread/Thread_unix.cc
- Thread/ThreadPool.cc
- Thread/WorkQueue.cc
+ Thread/CleanupManager.cc
+ Thread/Guard.cc
+ Thread/MutexPool.cc
+ Thread/ParallelBase.cc
+ Thread/Runnable.cc
+ Thread/Thread.cc
+ Thread/ThreadError.cc
+ Thread/SimpleReducer.cc
+ Thread/ThreadLock.cc
+ Thread/ThreadGroup.cc
+ Thread/Thread_unix.cc
+ Thread/ThreadPool.cc
+ Thread/WorkQueue.cc
)
# If we are using PTHREADS then add these files
@@ -144,7 +144,7 @@
Thread/Thread_win32.cc
Thread/Time_win32.cc
Thread/Time.h
- )
+ )
ENDIF(WIN32)
ENDIF (CMAKE_USE_PTHREADS_INIT)
- [Manta] r2273 - in trunk: . Core, James Bigler, 05/28/2008
Archive powered by MHonArc 2.6.16.