From 97e07dc162a57c22d9dd0f4b89f192c2084f7ce7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 5 Oct 2006 12:04:30 -0400 Subject: BUG: Test -isystem without affecting other tests. Made separate Library/SystemDir for this purpose. --- Tests/Complex/CMakeLists.txt | 3 ++- Tests/Complex/Library/SystemDir/testSystemDir.h | 2 ++ Tests/Complex/Library/testSystemDir.h | 2 -- Tests/ComplexOneConfig/CMakeLists.txt | 3 ++- Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h | 2 ++ Tests/ComplexOneConfig/Library/testSystemDir.h | 2 -- Tests/ComplexRelativePaths/CMakeLists.txt | 3 ++- Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h | 2 ++ Tests/ComplexRelativePaths/Library/testSystemDir.h | 2 -- 9 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 Tests/Complex/Library/SystemDir/testSystemDir.h delete mode 100644 Tests/Complex/Library/testSystemDir.h create mode 100644 Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h delete mode 100644 Tests/ComplexOneConfig/Library/testSystemDir.h create mode 100644 Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h delete mode 100644 Tests/ComplexRelativePaths/Library/testSystemDir.h diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 90f4820..fa3ee41 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -91,8 +91,8 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar) # Specify include and lib dirs # (BEFORE is for coverage) # -INCLUDE_DIRECTORIES(SYSTEM Library) INCLUDE_DIRECTORIES( + Library ${Complex_SOURCE_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source ) @@ -100,6 +100,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(BEFORE ${Complex_BINARY_DIR} ) +INCLUDE_DIRECTORIES(SYSTEM Library/SystemDir) INCLUDE_REGULAR_EXPRESSION("^(cmTest|file|sharedFile|test).*$" "^cmMissing") diff --git a/Tests/Complex/Library/SystemDir/testSystemDir.h b/Tests/Complex/Library/SystemDir/testSystemDir.h new file mode 100644 index 0000000..73be353 --- /dev/null +++ b/Tests/Complex/Library/SystemDir/testSystemDir.h @@ -0,0 +1,2 @@ +// Purposely leave off the return type to create a warning. +foo() { return 0; } diff --git a/Tests/Complex/Library/testSystemDir.h b/Tests/Complex/Library/testSystemDir.h deleted file mode 100644 index 73be353..0000000 --- a/Tests/Complex/Library/testSystemDir.h +++ /dev/null @@ -1,2 +0,0 @@ -// Purposely leave off the return type to create a warning. -foo() { return 0; } diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 90f4820..fa3ee41 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -91,8 +91,8 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar) # Specify include and lib dirs # (BEFORE is for coverage) # -INCLUDE_DIRECTORIES(SYSTEM Library) INCLUDE_DIRECTORIES( + Library ${Complex_SOURCE_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source ) @@ -100,6 +100,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(BEFORE ${Complex_BINARY_DIR} ) +INCLUDE_DIRECTORIES(SYSTEM Library/SystemDir) INCLUDE_REGULAR_EXPRESSION("^(cmTest|file|sharedFile|test).*$" "^cmMissing") diff --git a/Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h b/Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h new file mode 100644 index 0000000..73be353 --- /dev/null +++ b/Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h @@ -0,0 +1,2 @@ +// Purposely leave off the return type to create a warning. +foo() { return 0; } diff --git a/Tests/ComplexOneConfig/Library/testSystemDir.h b/Tests/ComplexOneConfig/Library/testSystemDir.h deleted file mode 100644 index 73be353..0000000 --- a/Tests/ComplexOneConfig/Library/testSystemDir.h +++ /dev/null @@ -1,2 +0,0 @@ -// Purposely leave off the return type to create a warning. -foo() { return 0; } diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt index 90f4820..fa3ee41 100644 --- a/Tests/ComplexRelativePaths/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/CMakeLists.txt @@ -91,8 +91,8 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar) # Specify include and lib dirs # (BEFORE is for coverage) # -INCLUDE_DIRECTORIES(SYSTEM Library) INCLUDE_DIRECTORIES( + Library ${Complex_SOURCE_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source ) @@ -100,6 +100,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(BEFORE ${Complex_BINARY_DIR} ) +INCLUDE_DIRECTORIES(SYSTEM Library/SystemDir) INCLUDE_REGULAR_EXPRESSION("^(cmTest|file|sharedFile|test).*$" "^cmMissing") diff --git a/Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h b/Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h new file mode 100644 index 0000000..73be353 --- /dev/null +++ b/Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h @@ -0,0 +1,2 @@ +// Purposely leave off the return type to create a warning. +foo() { return 0; } diff --git a/Tests/ComplexRelativePaths/Library/testSystemDir.h b/Tests/ComplexRelativePaths/Library/testSystemDir.h deleted file mode 100644 index 73be353..0000000 --- a/Tests/ComplexRelativePaths/Library/testSystemDir.h +++ /dev/null @@ -1,2 +0,0 @@ -// Purposely leave off the return type to create a warning. -foo() { return 0; } -- cgit v0.12