]> https://gitweb.dealii.org/ - dealii.git/commitdiff
remove redundant if 5641/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 18 Dec 2017 15:24:18 +0000 (09:24 -0600)
committerMatthias Maier <tamiko@43-1.org>
Mon, 18 Dec 2017 15:24:18 +0000 (09:24 -0600)
cmake/configure/configure_boost.cmake

index a794000d5b682f049155f95c4f54eacec43d6842..cd18fe693b82bcd26aa1d2e4c00984bcc1747f67 100644 (file)
@@ -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")

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.