Skip to content
Snippets Groups Projects
Commit 827b538a authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[CMake,ARPPACK] Cleanup of closing if statements without argument.

It's confusing and against our style-guide.
parent e2cdaa95
No related branches found
No related tags found
No related merge requests found
......@@ -18,6 +18,6 @@ function(add_dune_arpackpp_flags _targets)
string(REPLACE "_props-NOTFOUND" "" _props "${_props}")
set_target_properties(${_target} PROPERTIES COMPILE_FLAGS
"${_props} ${ARPACKPP_DUNE_COMPILE_FLAGS} -DENABLE_ARPACKPP=1")
endforeach(_target ${_targets})
endif(ARPACKPP_FOUND)
endforeach()
endif()
endfunction(add_dune_arpackpp_flags)
......@@ -30,7 +30,7 @@ if(NOT(Fortran_Works))
"Determing location of ARPACK failed:\n"
"Fortran support is required but could not be detected\n\n")
return()
endif(NOT(Fortran_Works))
endif()
# look for library, only at positions given by the user
find_library(ARPACK_LIBRARY
......@@ -57,7 +57,7 @@ cmake_push_check_state()
# correctly in the CMake files."
if(ARPACK_LIBRARY)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ARPACK_LIBRARY})
endif(ARPACK_LIBRARY)
endif()
# end of header usability check
cmake_pop_check_state()
......@@ -82,9 +82,9 @@ if(ARPACK_FOUND)
"Libraries to link against: ${ARPACK_LIBRARIES}\n\n")
set(ARPACK_DUNE_LIBRARIES ${ARPACK_LIBRARIES}
CACHE STRING "Libraries used by DUNE when linking ARPACK programs")
else(ARPACK_FOUND)
else()
# log errornous result
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determing location of ARPACK failed:\n"
"Libraries to link against: ${ARPACK_LIBRARIES}\n\n")
endif(ARPACK_FOUND)
endif()
......@@ -122,11 +122,11 @@ if(ARPACKPP_INCLUDE_DIR)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
${ARPACK_LIBRARIES}
${ARPACKPP_LIBRARY})
else(ARPACKPP_LIBRARY)
else()
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
${ARPACK_LIBRARIES})
endif(ARPACKPP_LIBRARY)
endif(ARPACKPP_INCLUDE_DIR)
endif()
endif()
# end of header usability check
cmake_pop_check_state()
......@@ -159,13 +159,13 @@ if(ARPACKPP_FOUND)
CACHE STRING "Compile flags used by DUNE when compiling ARPACK++ programs")
set(ARPACKPP_DUNE_LIBRARIES ${ARPACKPP_LIBRARIES}
CACHE STRING "Libraries used by DUNE when linking ARPACK++ programs")
else(ARPACKPP_FOUND)
else()
# log errornous result
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determing location of ARPACK++ failed:\n"
"Include directory: ${ARPACKPP_INCLUDE_DIRS}\n"
"Libraries to link against: ${ARPACKPP_LIBRARIES}\n\n")
endif(ARPACKPP_FOUND)
endif()
# set HAVE_ARPACKPP for config.h
set(HAVE_ARPACKPP ${ARPACKPP_FOUND})
......@@ -175,4 +175,4 @@ if(ARPACKPP_FOUND)
dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_ARPACKPP=1"
LIBRARIES "${ARPACKPP_LIBRARIES}"
INCLUDE_DIRS "${ARPACKPP_INCLUDE_DIRS}")
endif(ARPACKPP_FOUND)
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment