Skip to content
Snippets Groups Projects
Commit 0d49cc5c authored by Markus Blatt's avatar Markus Blatt
Browse files

Removed printf debugging output.

parent c78765c1
Branches
Tags
No related merge requests found
......@@ -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")
......
......@@ -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
......
......@@ -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
......
......@@ -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})
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})
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment