Merge branch 'release-4-6'

[alexxy/gromacs.git] / cmake / ThreadMPI.cmake

diff --git a/cmake/ThreadMPI.cmake b/cmake/ThreadMPI.cmake
index cc6822c74839af8c31e22af3115cba5816b8b0c5..bcd280ae08d48b7d9d2e31d4a1c8c9a740d73231 100644 (file)
--- a/cmake/ThreadMPI.cmake
+++ b/cmake/ThreadMPI.cmake
@@ -1,37 +1,3 @@
-# This source code file is part of thread_mpi.
-# Written by Sander Pronk, Erik Lindahl, and possibly others.
-#
-# Copyright (c) 2009, Sander Pronk, Erik Lindahl.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 1) Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2) Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3) Neither the name of the copyright holders nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY US ''AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL WE BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# If you want to redistribute modifications, please consider that
-# scientific software is very special. Version control is crucial -
-# bugs must be traceable. We will be happy to consider code for
-# inclusion in the official distribution, but derived work should not
-# be called official thread_mpi. Details are found in the README & COPYING
-# files.
 
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
@@ -42,7 +8,8 @@ MACRO(TMPI_TEST_ATOMICS)
     if (NOT DEFINED TMPI_ATOMICS)
         try_compile(TEST_ATOMICS "${CMAKE_BINARY_DIR}"
                 "${CMAKE_SOURCE_DIR}/cmake/TestAtomics.c"
-                COMPILE_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/include" )
+                COMPILE_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders" )
+
         if (TEST_ATOMICS)
             message(STATUS "Atomic operations found")
         else (TEST_ATOMICS)
@@ -84,8 +51,8 @@ MACRO(TMPI_ENABLE)
     foreach (_option IN ITEMS ${ARGN})
         if (_option STREQUAL "CXX")
             set(TMPI_CXX_LIB 1)
-        #elseif (_option STREQUAL "NOMPI")
-        #            set(TMPI_NO_MPI_LIB 1)
+        elseif (_option STREQUAL "NOMPI")
+            set(TMPI_NO_MPI_LIB 1)
         else ()
             message(FATAL_ERROR "Unknown thread_mpi option '${_option}'")
         endif ()