[test-suite] r338623 - cmake: Explicitely add current directory to include path for the couple benchmarks that need it

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Aug  1 13:22:34 2018
New Revision: 338623

URL: http://llvm.org/viewvc/llvm-project?rev=338623&view=rev
Log:
cmake: Explicitely add current directory to include path for the couple benchmarks that need it

Reduce the amount of unexpected things happening in llvm_multisource()
by adding the current source directory to the include path explicitely
in the couple benchmarks that need it.

(Ideally the benchmarks would use #include "" instead of #include <>...)

Modified:
    test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
    test-suite/trunk/cmake/modules/SingleMultiSource.cmake

Modified: test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt Wed Aug  1 13:22:34 2018
@@ -3,3 +3,4 @@ set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 llvm_multisource()
+target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt Wed Aug  1 13:22:34 2018
@@ -3,3 +3,4 @@ list(APPEND LDFLAGS -lstdc++)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_multisource()
+target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt Wed Aug  1 13:22:34 2018
@@ -11,3 +11,4 @@ else()
   endif()
 endif()
 llvm_multisource()
+target_include_directories(smg2000 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/miniFE/CMakeLists.txt?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt Wed Aug  1 13:22:34 2018
@@ -3,3 +3,4 @@ list(APPEND CXXFLAGS -I. -DMINIFE_SCALAR
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -nx 64 -ny 64 -nz 64)
 llvm_multisource()
+target_include_directories(miniFE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/CMakeLists.txt?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt Wed Aug  1 13:22:34 2018
@@ -1,3 +1,4 @@
 set(PROG city)
 list(APPEND LDFLAGS -lstdc++)
 llvm_multisource()
+target_include_directories(city PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=338623&r1=338622&r2=338623&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Wed Aug  1 13:22:34 2018
@@ -67,8 +67,6 @@ macro(llvm_multisource)
     endif()
     set(_target ${PROG})
     llvm_test_executable(${_target} ${sources})
-    target_include_directories(${_target}
-      PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
   endif()
 endmacro()