[test-suite] r294042 - External/CMakeLists: Skip autodetection if TEST_SUITE_EXTERNALS_DIR is set

[Matthias Braun via llvm-commits]

Author: matze
Date: Fri Feb  3 15:01:22 2017
New Revision: 294042

URL: http://llvm.org/viewvc/llvm-project?rev=294042&view=rev
Log:
External/CMakeLists: Skip autodetection if TEST_SUITE_EXTERNALS_DIR is set

Do not perform the autodetection in
${CMAKE_SOURCE_DIR}/test-suite-externals if the user explicitely
specified TEST_SUITE_EXTERNALS_DIR.

Modified:
    test-suite/trunk/External/CMakeLists.txt

Modified: test-suite/trunk/External/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/CMakeLists.txt?rev=294042&r1=294041&r2=294042&view=diff
==============================================================================
--- test-suite/trunk/External/CMakeLists.txt (original)
+++ test-suite/trunk/External/CMakeLists.txt Fri Feb  3 15:01:22 2017
@@ -9,13 +9,15 @@ set(TEST_SUITE_EXTERNALS_DIR "" CACHE PA
 #   - ${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}
 macro(llvm_externals_find PATHVAR NAME DESCRIPTION)
   set(${PATHVAR} "" CACHE PATH "Directory containing ${DESCRIPTION} sourcecode")
-  if(TEST_SUITE_EXTERNALS_DIR AND NOT ${PATHVAR} AND
-     IS_DIRECTORY "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
-    set(${PATHVAR} "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
-  endif()
-  if(NOT ${PATHVAR} AND
-     IS_DIRECTORY "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
-    set(${PATHVAR} "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
+  if(TEST_SUITE_EXTERNALS_DIR)
+    if (NOT ${PATHVAR} AND IS_DIRECTORY "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
+      set(${PATHVAR} "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
+    endif()
+  else()
+    if(NOT ${PATHVAR} AND
+       IS_DIRECTORY "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
+      set(${PATHVAR} "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
+    endif()
   endif()
   if(${PATHVAR})
     message(STATUS "Found ${DESCRIPTION}: ${${PATHVAR}}")