Commit 7e54a53a authored by Bill Hoffman's avatar Bill Hoffman

ENH: improve coverage

parent 4bad15e4
......@@ -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;
}
......@@ -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)
......
......@@ -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)
......@@ -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)
......
......@@ -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)
......@@ -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)
......
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment