From 501e5ad0e9a5d6c42b92c64c649680a4fe8b6033 Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Sat, 29 Jun 2013 22:10:48 +0200 Subject: [PATCH] Project-specific hooks no longer needs an extra arg. This change is already implemented in its own commit, but the CMakeLists.txt change is in its own commit to make it easier to distribute the changes to other projects without merge conflicts. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aba18fc..ecd74fc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,10 @@ set (doxy_dir "Documentation") set (${project}_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") list (APPEND CMAKE_MODULE_PATH ${${project}_MODULE_DIR}) -macro (prereqs_hook project) -endmacro (prereqs_hook project) +macro (prereqs_hook) +endmacro (prereqs_hook) -macro (sources_hook project) +macro (sources_hook) # Algebraic Multigrid must be compiled together with our program; # if it is not available, then remove our corresponding component find_package (AGMG) @@ -74,17 +74,17 @@ macro (sources_hook project) ${PROJECT_SOURCE_DIR}/examples/import_rewrite.cpp ) endif (NOT HAVE_ERT) -endmacro (sources_hook project) +endmacro (sources_hook) -macro (fortran_hook project) +macro (fortran_hook) # only include Fortran support if AGMG sources are available set (${project}_FORTRAN_IF HAVE_AGMG) -endmacro (fortran_hook project) +endmacro (fortran_hook) -macro (tests_hook project) +macro (tests_hook) cond_disable_test ("AGMG") cond_disable_test ("ERT") -endmacro (tests_hook project) +endmacro (tests_hook) # all setup common to the OPM library modules is done here include (OpmLibMain)