diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/Complex/Library/SystemDir/testSystemDir.h (renamed from Tests/ComplexRelativePaths/Library/testSystemDir.h) | 0 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h (renamed from Tests/ComplexOneConfig/Library/testSystemDir.h) | 0 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h (renamed from Tests/Complex/Library/testSystemDir.h) | 0 |
6 files changed, 6 insertions, 3 deletions
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/ComplexRelativePaths/Library/testSystemDir.h b/Tests/Complex/Library/SystemDir/testSystemDir.h index 73be353..73be353 100644 --- a/Tests/ComplexRelativePaths/Library/testSystemDir.h +++ b/Tests/Complex/Library/SystemDir/testSystemDir.h 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/testSystemDir.h b/Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h index 73be353..73be353 100644 --- a/Tests/ComplexOneConfig/Library/testSystemDir.h +++ b/Tests/ComplexOneConfig/Library/SystemDir/testSystemDir.h 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/Complex/Library/testSystemDir.h b/Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h index 73be353..73be353 100644 --- a/Tests/Complex/Library/testSystemDir.h +++ b/Tests/ComplexRelativePaths/Library/SystemDir/testSystemDir.h |