kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: improve coverage

This commit is contained in:
Bill Hoffman 2003-08-07 16:07:23 -04:00
parent 4bad15e4b2
commit 7e54a53a3d
7 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmIncludeExternalMSProjectCommand.cxx
View File

@ -24,30 +24,33 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con
this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect number of arguments"); this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect number of arguments");
return false; return false;
} }
// only compile this for win32 to avoid coverage errors
#ifdef _WIN32
if(m_Makefile->GetDefinition("WIN32")) { if(m_Makefile->GetDefinition("WIN32"))
{
std::string location = args[1]; std::string location = args[1];
std::vector<std::string> name_and_location; std::vector<std::string> name_and_location;
name_and_location.push_back(args[0]); name_and_location.push_back(args[0]);
name_and_location.push_back(location); name_and_location.push_back(location);
std::vector<std::string> depends; std::vector<std::string> depends;
if (args.size() > 2) { if (args.size() > 2)
for (unsigned int i=2; i<args.size(); ++i) { {
for (unsigned int i=2; i<args.size(); ++i)
{
depends.push_back(args[i]); depends.push_back(args[i]);
}
} }
}
std::string utility_name("INCLUDE_EXTERNAL_MSPROJECT"); std::string utility_name("INCLUDE_EXTERNAL_MSPROJECT");
utility_name += "_"; utility_name += "_";
utility_name += args[0]; utility_name += args[0];
m_Makefile->AddUtilityCommand(utility_name.c_str(), "echo", "\"Include external project\"", m_Makefile->AddUtilityCommand(utility_name.c_str(), "echo", "\"Include external project\"",
false, name_and_location, depends); false, name_and_location, depends);
} }
#endif
return true; return true;
} }

9
Tests/Complex/CMakeLists.txt
View File

@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
INCLUDE_INTERNALS INCLUDE_INTERNALS
CACHE_TEST_VAR_INTERNAL) 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 # Specify include and lib dirs
# (BEFORE is for coverage) # (BEFORE is for coverage)

3
Tests/Complex/Executable/CMakeLists.txt
View File

@ -58,3 +58,6 @@ CONFIGURE_FILE(
${Complex_BINARY_DIR}/cmVersion.h) ${Complex_BINARY_DIR}/cmVersion.h)
SOURCE_GROUP(A_GROUP ".cxx") SOURCE_GROUP(A_GROUP ".cxx")
SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx")
SOURCE_GROUP(C_GROUP FILES complex.cxx)

9
Tests/ComplexOneConfig/CMakeLists.txt
View File

@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
INCLUDE_INTERNALS INCLUDE_INTERNALS
CACHE_TEST_VAR_INTERNAL) 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 # Specify include and lib dirs
# (BEFORE is for coverage) # (BEFORE is for coverage)

3
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -58,3 +58,6 @@ CONFIGURE_FILE(
${Complex_BINARY_DIR}/cmVersion.h) ${Complex_BINARY_DIR}/cmVersion.h)
SOURCE_GROUP(A_GROUP ".cxx") SOURCE_GROUP(A_GROUP ".cxx")
SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx")
SOURCE_GROUP(C_GROUP FILES complex.cxx)

9
Tests/ComplexRelativePaths/CMakeLists.txt
View File

@ -49,6 +49,15 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
INCLUDE_INTERNALS INCLUDE_INTERNALS
CACHE_TEST_VAR_INTERNAL) 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 # Specify include and lib dirs
# (BEFORE is for coverage) # (BEFORE is for coverage)

3
Tests/ComplexRelativePaths/Executable/CMakeLists.txt
View File

@ -58,3 +58,6 @@ CONFIGURE_FILE(
${Complex_BINARY_DIR}/cmVersion.h) ${Complex_BINARY_DIR}/cmVersion.h)
SOURCE_GROUP(A_GROUP ".cxx") SOURCE_GROUP(A_GROUP ".cxx")
SOURCE_GROUP(B_GROUP REGULAR_EXPRESSION "cxx")
SOURCE_GROUP(C_GROUP FILES complex.cxx)