From: Matthias Maier Date: Mon, 18 Dec 2017 15:24:18 +0000 (-0600) Subject: remove redundant if X-Git-Tag: v9.0.0-rc1~645^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6f5792e91c2a80e050415728216158b2d9ffaa3;p=dealii.git remove redundant if --- diff --git a/cmake/configure/configure_boost.cmake b/cmake/configure/configure_boost.cmake index a794000d5b..cd18fe693b 100644 --- a/cmake/configure/configure_boost.cmake +++ b/cmake/configure/configure_boost.cmake @@ -141,30 +141,29 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var) IF(NOT DEFINED BOOST_SERIALIZATION_USABLE OR NOT ${BOOST_SERIALIZATION_USABLE}) # Only run this check if it hasn't successfully run previously. MESSAGE(STATUS "Performing Test BOOST_SERIALIZATION_USABLE") - IF(DEAL_II_ALLOW_PLATFORM_INTROSPECTION) - FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug) - FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug) + + FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug) + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug) + EXECUTE_PROCESS( + COMMAND ${CMAKE_COMMAND} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + "-DBOOST_INCLUDE_DIRS=${BOOST_INCLUDE_DIRS}" + "-DBOOST_LIBRARIES=${BOOST_LIBRARIES}" + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/configure/TestBoostBug + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug + RESULT_VARIABLE _result + OUTPUT_QUIET + ERROR_QUIET + ) + IF(${_result} EQUAL 0) EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - "-DBOOST_INCLUDE_DIRS=${BOOST_INCLUDE_DIRS}" - "-DBOOST_LIBRARIES=${BOOST_LIBRARIES}" - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/configure/TestBoostBug + COMMAND ${CMAKE_COMMAND} --build . --target run WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug RESULT_VARIABLE _result OUTPUT_QUIET ERROR_QUIET ) - IF(${_result} EQUAL 0) - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} --build . --target run - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake/configure/TestBoostBug - RESULT_VARIABLE _result - OUTPUT_QUIET - ERROR_QUIET - ) - ENDIF() ENDIF() IF(${_result} EQUAL 0) MESSAGE(STATUS "Performing Test BOOST_SERIALIZATION_USABLE - Success")