[test-suite] r338789 - cmake: Drop DISABLE_CXX flag

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 2 16:47:32 PDT 2018


Author: matze
Date: Thu Aug  2 16:47:32 2018
New Revision: 338789

URL: http://llvm.org/viewvc/llvm-project?rev=338789&view=rev
Log:
cmake: Drop DISABLE_CXX flag

- This comes from the initial makefile conversion
- As far as I can tell it was not working properly
- It was never exposed as a user configuration option

Modified:
    test-suite/trunk/MicroBenchmarks/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt

Modified: test-suite/trunk/MicroBenchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MicroBenchmarks/CMakeLists.txt?rev=338789&r1=338788&r2=338789&view=diff
==============================================================================
--- test-suite/trunk/MicroBenchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MicroBenchmarks/CMakeLists.txt Thu Aug  2 16:47:32 2018
@@ -1,9 +1,6 @@
-if(NOT DEFINED DISABLE_CXX)
-  file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-  add_subdirectory(libs)
-  add_subdirectory(XRay)
-  add_subdirectory(LCALS)
-  add_subdirectory(harris)
-
-endif()
+add_subdirectory(libs)
+add_subdirectory(XRay)
+add_subdirectory(LCALS)
+add_subdirectory(harris)

Modified: test-suite/trunk/MultiSource/Applications/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/CMakeLists.txt?rev=338789&r1=338788&r2=338789&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/CMakeLists.txt Thu Aug  2 16:47:32 2018
@@ -11,14 +11,12 @@ add_subdirectory(sgefa)
 add_subdirectory(spiff)
 add_subdirectory(viterbi)
 
-if(NOT DEFINED DISABLE_CXX)
-  add_subdirectory(ALAC)
-  add_subdirectory(hbd)
-  add_subdirectory(lambda-0.1.3)
-  add_subdirectory(minisat)
-  if(NOT TARGET_OS STREQUAL "SunOS")
-    add_subdirectory(hexxagon)
-  endif()
+add_subdirectory(ALAC)
+add_subdirectory(hbd)
+add_subdirectory(lambda-0.1.3)
+add_subdirectory(minisat)
+if(NOT TARGET_OS STREQUAL "SunOS")
+  add_subdirectory(hexxagon)
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
   add_subdirectory(lua)
@@ -27,9 +25,7 @@ if(TARGET_OS STREQUAL "Linux" AND (NOT A
   add_subdirectory(obsequi)
 endif()
 if(NOT TARGET_OS STREQUAL "SunOS")
-  if(NOT DEFINED DISABLE_CXX)
-    add_subdirectory(kimwitu++)
-  endif()
+  add_subdirectory(kimwitu++)
 endif()
 if(NOT TARGET_OS STREQUAL "SunOS")
   add_subdirectory(SPASS)

Modified: test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt?rev=338789&r1=338788&r2=338789&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt Thu Aug  2 16:47:32 2018
@@ -24,15 +24,13 @@ add_subdirectory(Rodinia)
 if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
   add_subdirectory(TSVC)
 endif()
-if(NOT DEFINED DISABLE_CXX)
-  add_subdirectory(Prolangs-C++)
-  add_subdirectory(Bullet)
-  add_subdirectory(tramp3d-v4)
-  add_subdirectory(DOE-ProxyApps-C++)
-  if(NOT "${ARCH}" STREQUAL "XCore")
-    add_subdirectory(7zip)
-    add_subdirectory(PAQ8p)
-  endif()
+add_subdirectory(Prolangs-C++)
+add_subdirectory(Bullet)
+add_subdirectory(tramp3d-v4)
+add_subdirectory(DOE-ProxyApps-C++)
+if(NOT "${ARCH}" STREQUAL "XCore")
+  add_subdirectory(7zip)
+  add_subdirectory(PAQ8p)
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
   add_subdirectory(mafft)




More information about the llvm-commits mailing list