From 0d49cc5cceaedf2dcb976b529b170773f8f4368f Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Tue, 20 Aug 2013 20:55:04 +0200
Subject: [PATCH] Removed printf debugging output.
---
CMakeLists.txt | 4 ++--
bin/dunecontrol | 4 +---
cmake/modules/DuneDoc.cmake | 1 -
cmake/modules/FindMProtect.cmake | 2 --
cmake/scripts/BuildTests.cmake.in | 5 +----
lib/dunecommonam2cmake.lib | 6 +++---
6 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b7cb29ca..81b1161e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,10 @@ project("dune-common" C CXX)
# general stuff
cmake_minimum_required(VERSION 2.8.6)
-message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}|")
+
# make sure our own modules are found
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules")
-message("CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+
# set the script dir for the macros.
set(DUNE_COMMON_SCRIPT_DIR "${PROJECT_SOURCE_DIR}/cmake/scripts")
diff --git a/bin/dunecontrol b/bin/dunecontrol
index 2c5bf38f3..f2f6442bd 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -521,7 +521,7 @@ run_default_configure () {
else
LOCAL_USE_CMAKE=no
fi
- echo "LOCAL_USE_CMAKE=$LOCAL_USE_CMAKE $(eval "echo \$PATH_$module")/CMakeLists.txt"
+
if test -x configure || test "x$LOCAL_USE_CMAKE" = "xyes" ; then
ACLOCAL_FLAGS="-I ."
if test -d "m4"; then
@@ -537,7 +537,6 @@ run_default_configure () {
# Translate the configure PARMS to cmake
export PARAMS
export CMAKE_PARAMS
- echo module_translate_options_am2cmake $m $path/lib
module_translate_options_am2cmake $m $path/lib
fi
if test x$module = x$m; then continue; fi # skip myself
@@ -583,7 +582,6 @@ run_default_configure () {
test -d "$BUILDDIR" || mkdir "$BUILDDIR"
SRCDIR="$PWD"
cd "$BUILDDIR"
- echo `pwd`
echo "$PREPARAMS cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
eval $PREPARAMS cmake "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR" || exit 1
else
diff --git a/cmake/modules/DuneDoc.cmake b/cmake/modules/DuneDoc.cmake
index ea2858d08..4b19ccec2 100644
--- a/cmake/modules/DuneDoc.cmake
+++ b/cmake/modules/DuneDoc.cmake
@@ -83,7 +83,6 @@ MACRO(dune_add_latex_document tex_file)
string(REGEX REPLACE "/" "_" "${CMAKE_CURRENT_SOURCE_DIR}/${file}" filevar ${file})
set(filevar "filevar-NOTFOUND")
find_file(filevar ${tex_file} ${CMAKE_CURRENT_SOURCE_DIR})
- message(filevar=${filevar} tex_file=${tex_file} CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR})
if(filevar)
if(LATEX_USABLE)
# add rule to create latex document
diff --git a/cmake/modules/FindMProtect.cmake b/cmake/modules/FindMProtect.cmake
index e4afe68f8..955ae1abd 100644
--- a/cmake/modules/FindMProtect.cmake
+++ b/cmake/modules/FindMProtect.cmake
@@ -5,11 +5,9 @@
# HAVE_SYS_MMAN_H
# HAVE_MPROTECT
check_include_file("sys/mman.h" HAVE_SYS_MMAN_H)
-message(STATUS HAVE_SYS_MMAN_H=${HAVE_SYS_MMAN_H})
include(CheckCSourceCompiles)
check_c_source_compiles("
#include <sys/mman.h>
int main(void){
mprotect(0,0,PROT_NONE);
}" HAVE_MPROTECT)
-message(STATUS HAVE_MPROTECT=${HAVE_MPROTECT})
diff --git a/cmake/scripts/BuildTests.cmake.in b/cmake/scripts/BuildTests.cmake.in
index c2aadf7ab..fe1045641 100644
--- a/cmake/scripts/BuildTests.cmake.in
+++ b/cmake/scripts/BuildTests.cmake.in
@@ -1,12 +1,9 @@
MACRO(get_directory_test_target _target _dir)
- message("$_dir")
string(REPLACE "@CMAKE_BINARY_DIR@" "" _relative_dir "${_dir}")
- message("$_relative_dir")
string(REPLACE "/" "_" ${_target} "${_relative_dir}")
- message("target=${${_target}}")
ENDMACRO(get_directory_test_target _target _dir)
get_directory_test_target(_build_test_target "@CMAKE_CURRENT_BINARY_DIR@")
message("binary_dir=@CMAKE_CURRENT_BINARY_DIR@")
execute_process(COMMAND @CMAKE_COMMAND@ --build @CMAKE_BINARY_DIR@
- --target ${_build_test_target})
\ No newline at end of file
+ --target ${_build_test_target})
diff --git a/lib/dunecommonam2cmake.lib b/lib/dunecommonam2cmake.lib
index 2a041d7ff..e28682e39 100644
--- a/lib/dunecommonam2cmake.lib
+++ b/lib/dunecommonam2cmake.lib
@@ -20,18 +20,18 @@ dune_common_options_am2cmake()
default_am2cmake_options $CMAKE_PACKAGES
# Check for --enable-parallel and otherwise deactivate MPI
- echo $PARAMS | grep \\-\\-enable-parallel
+ echo $PARAMS | grep \\-\\-enable-parallel > /dev/null
if test "$?" -ne 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_DISABLE_FIND_PACKAGE_MPI=TRUE"
fi
# Check for --disable-gxx0xcheck
- echo $PARAMS | grep \\-\\-disable-gxx0xcheck
+ echo $PARAMS | grep \\-\\-disable-gxx0xcheck > /dev/null
if test "$?" -eq 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_GXX0XCHECK:Bool=TRUE"
fi
# Check for --disable-gxx0xcheck
- echo $PARAMS | grep \\-\\-disable-tr1-headers
+ echo $PARAMS | grep \\-\\-disable-tr1-headers > /dev/null
if test "$?" -eq 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_TR1_HEADERS:Bool=TRUE"
fi
--
GitLab