diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-07-27 22:43:04 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-07-27 22:43:04 (GMT) |
| commit | 7a649111cdea2b10f2ec57084416be619867fbfb (patch) | |
| tree | 072e1343376835ba4dda7689db02dc51598e005b /Tests/ComplexOneConfig | |
| parent | 5d0d980d9949daf596e10715d686adc95c1c232b (diff) | |
| download | CMake-7a649111cdea2b10f2ec57084416be619867fbfb.zip CMake-7a649111cdea2b10f2ec57084416be619867fbfb.tar.gz CMake-7a649111cdea2b10f2ec57084416be619867fbfb.tar.bz2 | |
Use string(APPEND) in Tests
Automate with:
find Tests -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
Diffstat (limited to 'Tests/ComplexOneConfig')
| -rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Library/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/VarTests.cmake | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 9090ab5..1b833b2 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -88,7 +88,7 @@ endif() if(CMAKE_SYSTEM MATCHES "OSF1-V") if(NOT CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ") + string(APPEND CMAKE_CXX_FLAGS " -timplicit_local -no_implicit_include ") endif() endif() @@ -399,7 +399,7 @@ set(CMAKE_CXX_EXTENSIONS TRUE) # template support also need a flag to use the newer C++ library. if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA") + string(APPEND CMAKE_CXX_FLAGS " -AA") endif () # Clang/C2 in C++98 mode cannot properly handle some of MSVC headers diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 4897b48..f935aed 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -1,8 +1,8 @@ # # Create exe. # -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS") +string(APPEND CMAKE_CXX_FLAGS " -DTEST_CXX_FLAGS") +string(APPEND CMAKE_C_FLAGS " -DTEST_C_FLAGS") # Create an imported target for if(TARGET) test below. add_library(ExeImportedTarget UNKNOWN IMPORTED) diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index f00cbd6..dbf806e 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -43,7 +43,7 @@ endif() # set(SharedLibrarySources sharedFile) add_library(CMakeTestLibraryShared SHARED ${SharedLibrarySources}) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS") +string(APPEND CMAKE_C_FLAGS " -DTEST_C_FLAGS") add_library(CMakeTestCLibraryShared SHARED testConly.c) define_property( TARGET PROPERTY FOO diff --git a/Tests/ComplexOneConfig/VarTests.cmake b/Tests/ComplexOneConfig/VarTests.cmake index 70b803a..9d35949 100644 --- a/Tests/ComplexOneConfig/VarTests.cmake +++ b/Tests/ComplexOneConfig/VarTests.cmake @@ -180,5 +180,5 @@ endforeach() set(FOREACH_CONCAT "") foreach (INDEX a;b;c;d;e;f;g) - set(FOREACH_CONCAT "${FOREACH_CONCAT}${INDEX}") + string(APPEND FOREACH_CONCAT "${INDEX}") endforeach() |