diff options
| -rw-r--r-- | Source/cmIncludeExternalMSProjectCommand.cxx | 27 | ||||
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 3 |
7 files changed, 51 insertions, 12 deletions
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index 11d84c4..20a6d8e 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -24,30 +24,33 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect number of arguments"); return false; } - - - if(m_Makefile->GetDefinition("WIN32")) { - +// only compile this for win32 to avoid coverage errors +#ifdef _WIN32 + if(m_Makefile->GetDefinition("WIN32")) + { std::string location = args[1]; - + std::vector<std::string> name_and_location; name_and_location.push_back(args[0]); name_and_location.push_back(location); std::vector<std::string> depends; - if (args.size() > 2) { - for (unsigned int i=2; i<args.size(); ++i) { + if (args.size() > 2) + { + for (unsigned int i=2; i<args.size(); ++i) + { depends.push_back(args[i]); + } } - } - + std::string utility_name("INCLUDE_EXTERNAL_MSPROJECT"); utility_name += "_"; utility_name += args[0]; - + m_Makefile->AddUtilityCommand(utility_name.c_str(), "echo", "\"Include external project\"", false, name_and_location, depends); - - } + + } +#endif return true; } diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index e6444ab..aa376e5 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_INTERNALS CACHE_TEST_VAR_INTERNAL) +LOAD_CACHE(${Complex_BINARY_DIR} READ_WITH_PREFIX foo CACHE_TEST_VAR_INTERNAL) +IF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE("Load cache worked") +ELSE(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE(FATAL_ERROR "Load cache with prefix failed") +ENDIF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + + + # # Specify include and lib dirs # (BEFORE is for coverage) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index fca3901..5e88795 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -58,3 +58,6 @@ CONFIGURE_FILE( ${Complex_BINARY_DIR}/cmVersion.h) SOURCE_GROUP(A_GROUP ".cxx") +SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx") +SOURCE_GROUP(C_GROUP FILES complex.cxx) + diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index e6444ab..aa376e5 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_INTERNALS CACHE_TEST_VAR_INTERNAL) +LOAD_CACHE(${Complex_BINARY_DIR} READ_WITH_PREFIX foo CACHE_TEST_VAR_INTERNAL) +IF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE("Load cache worked") +ELSE(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE(FATAL_ERROR "Load cache with prefix failed") +ENDIF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + + + # # Specify include and lib dirs # (BEFORE is for coverage) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index fca3901..5e88795 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -58,3 +58,6 @@ CONFIGURE_FILE( ${Complex_BINARY_DIR}/cmVersion.h) SOURCE_GROUP(A_GROUP ".cxx") +SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx") +SOURCE_GROUP(C_GROUP FILES complex.cxx) + diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt index e6444ab..aa376e5 100644 --- a/Tests/ComplexRelativePaths/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/CMakeLists.txt @@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_INTERNALS CACHE_TEST_VAR_INTERNAL) +LOAD_CACHE(${Complex_BINARY_DIR} READ_WITH_PREFIX foo CACHE_TEST_VAR_INTERNAL) +IF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE("Load cache worked") +ELSE(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + MESSAGE(FATAL_ERROR "Load cache with prefix failed") +ENDIF(${fooCACHE_TEST_VAR_INTERNAL} MATCHES bar) + + + # # Specify include and lib dirs # (BEFORE is for coverage) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index fca3901..5e88795 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -58,3 +58,6 @@ CONFIGURE_FILE( ${Complex_BINARY_DIR}/cmVersion.h) SOURCE_GROUP(A_GROUP ".cxx") +SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx") +SOURCE_GROUP(C_GROUP FILES complex.cxx) + |