Commit ccdab21b authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge in fixes from head RC 4

parent 31d13b01
......@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 6)
SET(CMake_VERSION_PATCH 3)
SET(CMake_VERSION_RC 3)
SET(CMake_VERSION_RC 4)
# CVS versions are odd, if this is an odd minor version
# then set the CMake_VERSION_DATE variable
IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
......
Changes in CMake 2.6.3 RC 4
- Fix for SccProvider in visual studio
- fix for missing package_source target
- FindQt4 QT_PHONON_MODULE_DEPENDS fixes
- Fixes for GetPrerequisites.cmake system libraries on Mac and UNIX
- Merge in kwsys Haiku DynaimcLoader change
Changes in CMake 2.6.3 RC 3
- Merge in CMakeLists.txt curl Haiku change
Changes in CMake 2.6.3 RC 2
......
......@@ -69,9 +69,17 @@ function(gp_file_type original_file file type_var)
endif("${file}" MATCHES "^@(executable|loader)_path")
if(NOT is_embedded)
if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
set(is_system 1)
endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
if(UNIX)
if("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
set(is_system 1)
endif("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
endif(UNIX)
if(APPLE)
if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
set(is_system 1)
endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
endif(APPLE)
if(WIN32)
string(TOLOWER "$ENV{SystemRoot}" sysroot)
......@@ -406,7 +414,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
if("${gp_tool}" STREQUAL "ldd")
set(gp_cmd_args "")
set(gp_regex "^\t([\t ]+)[\t ].*${eol_char}$")
set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)
set(gp_tool_known 1)
endif("${gp_tool}" STREQUAL "ldd")
......
......@@ -41,7 +41,11 @@ SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
IF(QT_QTDBUS_FOUND)
SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
ELSE(QT_QTDBUS_FOUND)
SET(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
ENDIF(QT_QTDBUS_FOUND)
SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
......
......@@ -1607,7 +1607,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
singleLine.push_back(this->GetCMakeInstance()->GetCPackCommand());
singleLine.push_back("--config");
configFile = mf->GetStartOutputDirectory();;
configFile += "/CPackSourceCConfig.cmake";
configFile += "/CPackSourceConfig.cmake";
relConfigFile = "./CPackSourceConfig.cmake";
singleLine.push_back(relConfigFile);
if(cmSystemTools::FileExists(configFile.c_str()))
......
......@@ -1833,25 +1833,8 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
keyword = "Win32Proj";
}
const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
if (!vsProjectname)
{
vsProjectname = "";
}
const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
if (!vsLocalpath)
{
vsLocalpath = "";
}
const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
std::string providerString;
if (!vsProvider)
{
providerString = "";
}
else
{
providerString = "\tSccProvider=\"" + std::string(vsProvider) + "\"\n";
}
cmGlobalVisualStudio7Generator* gg =
static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
fout << "\tName=\"" << projLabel << "\"\n";
......@@ -1865,7 +1848,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
{
fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
<< "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
<< "\tSccProvider=\"" << providerString << "\"\n";
<< "\tSccProvider=\"" << vsProvider << "\"\n";
}
fout << "\tKeyword=\"" << keyword << "\">\n"
<< "\t<Platforms>\n"
......
......@@ -69,6 +69,8 @@ public:
#else
typedef void* LibraryHandle;
#endif
#elif defined(__HAIKU__)
typedef image_id LibraryHandle;
#elif defined(__BEOS__)
typedef image_id LibraryHandle;
#else // POSIX
......
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