[test-suite] r286178 - cmake: Only put preprocessor flags in CPPFLAGS

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 7 15:44:41 PST 2016


Author: matze
Date: Mon Nov  7 17:44:40 2016
New Revision: 286178

URL: http://llvm.org/viewvc/llvm-project?rev=286178&view=rev
Log:
cmake: Only put preprocessor flags in CPPFLAGS

CPPFLAGS are for the C-PreProcessor; codegen and warning flags need to
go to CFLAGS or CXXFLAGS.

Modified:
    test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
    test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt
    test-suite/trunk/External/skidmarks10/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt

Modified: test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -44,7 +44,7 @@ else()
   list(APPEND SourceNames unix_perlmain.c)
   list(APPEND CPPFLAGS -DSPEC_CPU2000_LINUX)
 endif()
-list(APPEND CPPFLAGS -std=gnu89)
+list(APPEND CFLAGS -std=gnu89)
 
 include(TestBigEndian)
 test_big_endian(IS_BIGENDIAN)

Modified: test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,6 +1,6 @@
 # iOS compiler have -Werror=return-value, need to disable this explicitely
 # (-w is not enough)
-list(APPEND CPPFLAGS -Wno-return-type)
+list(APPEND CFLAGS -Wno-return-type)
 
 macro(test_input run_type input output)
   llvm_test_run(RUN_TYPE ${run_type}

Modified: test-suite/trunk/External/skidmarks10/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/External/skidmarks10/CMakeLists.txt (original)
+++ test-suite/trunk/External/skidmarks10/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -5,7 +5,7 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
   file(GLOB Source ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
   list(APPEND CPPFLAGS -I${TEST_SUITE_SKIDMARKS10_ROOT}/source)
   if(ARCH STREQUAL "x86")
-    list(APPEND CPPFLAGS -msse3)
+    list(APPEND CFLAGS -msse3)
   endif()
 
   llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden

Modified: test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,5 @@
 set(PROG ldecod)
-list(APPEND CPPFLAGS -D __USE_LARGEFILE64 -D _FILE_OFFSET_BITS=64)
+list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm ${TOOLLINKOPTS})
 set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/data/test.264 -o Output/test_dec.yuv -r ${CMAKE_CURRENT_SOURCE_DIR}/data/test_rec.yuv)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,5 @@
 set(PROG lencod)
-list(APPEND CPPFLAGS -D __USE_LARGEFILE64 -D _FILE_OFFSET_BITS=64)
+list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.025)
 if(DEFINED SMALL_PROBLEM_SIZE)

Modified: test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,6 @@
 set(PROG SPASS)
-list(APPEND CPPFLAGS -DCLOCK_NO_TIMING -fno-strict-aliasing -w)
+list(APPEND CPPFLAGS -DCLOCK_NO_TIMING)
+list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
 if(DEFINED SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/small_problem.dfg")

Modified: test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,5 @@
 set(PROG oggenc)
-list(APPEND CPPFLAGS -fno-strict-aliasing)
+list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune)
 set(RUN_OPTIONS "-Q -s 901820 -")

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,5 @@
 set(PROG consumer-lame)
-list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE)
+list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -DLAMESNDFILE)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav /dev/null)
 set(USE_REFERENCE_OUTPUT 1)

Modified: test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,5 +1,5 @@
 set(PROG tramp3d-v4)
-list(APPEND CPPFLAGS -fno-exceptions)
+list(APPEND CXXFLAGS -fno-exceptions)
 list(APPEND LDFLAGS -lstdc++)
 if(DEFINED SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS --cartvis 1.0 0.0 --rhomin 1e-8 -n 4 --domain 32 32 32)

Modified: test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,4 +1,4 @@
-list(APPEND CPPFLAGS -std=c++11)
+list(APPEND CXXFLAGS -std=c++11)
 
 if(NOT MIPS_IS_MIPS16_ENABLED)
   add_subdirectory(frame_layout)

Modified: test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/C%2B%2B11/frame_layout/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,3 +1,3 @@
 set(PROG frame_layout)
-list(APPEND CPPFLAGS -std=c++11)
+list(APPEND CXXFLAGS -std=c++11)
 llvm_multisource()

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B-EH/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,4 +1,4 @@
-list(APPEND CPPFLAGS -pthread)
+list(APPEND CXXFLAGS -pthread)
 list(APPEND LDFLAGS -lm -lstdc++ -pthread)
 set(REQUIRES_EH_SUPPORT 1)
 llvm_singlesource()

Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,7 +1,6 @@
 add_subdirectory(EH)
 
 list(APPEND CXXFLAGS -Wno-deprecated)
-list(APPEND CPPFLAGS -Wno-deprecated)
 set(FP_TOLERANCE 0.00000001)
 if(ARCH STREQUAL "XCore")
   if(NOT DEFINED SMALL_PROBLEM_SIZE)

Modified: test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=286178&r1=286177&r2=286178&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt Mon Nov  7 17:44:40 2016
@@ -1,3 +1,3 @@
-list(APPEND CPPFLAGS -std=c++11 -pthread)
+list(APPEND CXXFLAGS -std=c++11 -pthread)
 list(APPEND LDFLAGS -lstdc++ -pthread)
 llvm_singlesource()




More information about the llvm-commits mailing list