[Cmake-commits] [cmake-commits] king committed CMake.desktop 1.2.2.1 1.2.2.2 CMakeIngestOSXBundleLibraries.cmake 1.3 1.3.4.1 CMakeLists.txt 1.23.2.1 1.23.2.2 CMakeSetup.cxx 1.24.2.2 1.24.2.3 CMakeSetup.png 1.1 NONE CMakeSetup.qrc 1.4 1.4.4.1 CMakeSetup128.png NONE 1.1.2.2 CMakeSetup32.png NONE 1.1.2.2 QMacInstallDialog.cxx 1.5 1.5.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:48:04 EST 2010
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv23913/Source/QtDialog
Modified Files:
Tag: CMake-2-8
CMake.desktop CMakeIngestOSXBundleLibraries.cmake
CMakeLists.txt CMakeSetup.cxx CMakeSetup.qrc
QMacInstallDialog.cxx
Added Files:
Tag: CMake-2-8
CMakeSetup128.png CMakeSetup32.png
Removed Files:
Tag: CMake-2-8
CMakeSetup.png
Log Message:
CMake 2.8.1-rc1
--- NEW FILE: CMakeSetup32.png ---
(This appears to be a binary file; contents omitted.)
Index: CMake.desktop
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMake.desktop,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** CMake.desktop 9 Oct 2009 20:11:36 -0000 1.2.2.1
--- CMake.desktop 28 Jan 2010 21:48:02 -0000 1.2.2.2
***************
*** 4,8 ****
Comment=Cross-platform buildsystem
Exec=cmake-gui %f
! Icon=CMakeSetup.png
Terminal=false
X-MultipleArgs=false
--- 4,8 ----
Comment=Cross-platform buildsystem
Exec=cmake-gui %f
! Icon=CMakeSetup32.png
Terminal=false
X-MultipleArgs=false
Index: QMacInstallDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QMacInstallDialog.cxx,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** QMacInstallDialog.cxx 23 Apr 2008 13:58:18 -0000 1.5
--- QMacInstallDialog.cxx 28 Jan 2010 21:48:02 -0000 1.5.2.1
***************
*** 34,39 ****
{
QDir installDir(this->Internals->InstallPrefix->text());
! std::string installTo = installDir.path().toStdString();
! if(!cmSystemTools::FileExists(installTo.c_str()))
{
QString message = tr("Build install does not exist, "
--- 34,39 ----
{
QDir installDir(this->Internals->InstallPrefix->text());
! QString installTo = installDir.path();
! if(!cmSystemTools::FileExists(installTo.toAscii().data()))
{
QString message = tr("Build install does not exist, "
***************
*** 48,52 ****
if(btn == QMessageBox::Yes)
{
! cmSystemTools::MakeDirectory(installTo.c_str());
}
}
--- 48,52 ----
if(btn == QMessageBox::Yes)
{
! cmSystemTools::MakeDirectory(installTo.toAscii().data());
}
}
***************
*** 57,78 ****
{
QFileInfo fileInfo = list.at(i);
! std::string filename = fileInfo.fileName().toStdString();
if(filename.size() && filename[0] == '.')
{
continue;
}
! std::string file = fileInfo.absoluteFilePath().toStdString();
! std::string newName = installTo;
newName += "/";
newName += filename;
// Remove the old files
! if(cmSystemTools::FileExists(newName.c_str()))
{
! std::cout << "rm [" << newName << "]\n";
! if(!cmSystemTools::RemoveFile(newName.c_str()))
{
QString message = tr("Failed to remove file "
"installation may be incomplete: ");
! message += newName.c_str();
QString title = tr("Error Removing file");
QMessageBox::StandardButton btn =
--- 57,78 ----
{
QFileInfo fileInfo = list.at(i);
! QString filename = fileInfo.fileName();
if(filename.size() && filename[0] == '.')
{
continue;
}
! QString file = fileInfo.absoluteFilePath();
! QString newName = installTo;
newName += "/";
newName += filename;
// Remove the old files
! if(cmSystemTools::FileExists(newName.toAscii().data()))
{
! std::cout << "rm [" << newName.toAscii().data() << "]\n";
! if(!cmSystemTools::RemoveFile(newName.toAscii().data()))
{
QString message = tr("Failed to remove file "
"installation may be incomplete: ");
! message += newName.toAscii().data();
QString title = tr("Error Removing file");
QMessageBox::StandardButton btn =
***************
*** 85,96 ****
}
}
! std::cout << "ln -s [" << file << "] [";
! std::cout << newName << "]\n";
! if(!cmSystemTools::CreateSymlink(file.c_str(),
! newName.c_str()))
{
QString message = tr("Failed create symlink "
"installation may be incomplete: ");
! message += newName.c_str();
QString title = tr("Error Creating Symlink");
QMessageBox::StandardButton btn =
--- 85,96 ----
}
}
! std::cout << "ln -s [" << file.toAscii().data() << "] [";
! std::cout << newName.toAscii().data() << "]\n";
! if(!cmSystemTools::CreateSymlink(file.toAscii().data(),
! newName.toAscii().data()))
{
QString message = tr("Failed create symlink "
"installation may be incomplete: ");
! message += newName.toAscii().data();
QString title = tr("Error Creating Symlink");
QMessageBox::StandardButton btn =
--- CMakeSetup.png DELETED ---
--- NEW FILE: CMakeSetup128.png ---
(This appears to be a binary file; contents omitted.)
Index: CMakeSetup.qrc
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.qrc,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C 2 -d -r1.4 -r1.4.4.1
*** CMakeSetup.qrc 13 Nov 2007 04:54:49 -0000 1.4
--- CMakeSetup.qrc 28 Jan 2010 21:48:02 -0000 1.4.4.1
***************
*** 1,5 ****
<RCC>
<qresource prefix="/Icons" >
! <file>CMakeSetup.png</file>
<file>Delete16.png</file>
<file>Plus16.png</file>
--- 1,6 ----
<RCC>
<qresource prefix="/Icons" >
! <file>CMakeSetup128.png</file>
! <file>CMakeSetup32.png</file>
<file>Delete16.png</file>
<file>Plus16.png</file>
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C 2 -d -r1.23.2.1 -r1.23.2.2
*** CMakeLists.txt 1 Oct 2009 21:21:15 -0000 1.23.2.1
--- CMakeLists.txt 28 Jan 2010 21:48:02 -0000 1.23.2.2
***************
*** 98,102 ****
# with an icon
INSTALL(FILES CMake.desktop DESTINATION share/applications )
! INSTALL(FILES CMakeSetup.png DESTINATION share/pixmaps )
INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
ENDIF(UNIX)
--- 98,102 ----
# with an icon
INSTALL(FILES CMake.desktop DESTINATION share/applications )
! INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps )
INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
ENDIF(UNIX)
Index: CMakeIngestOSXBundleLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C 2 -d -r1.3 -r1.3.4.1
*** CMakeIngestOSXBundleLibraries.cmake 18 Feb 2008 19:51:43 -0000 1.3
--- CMakeIngestOSXBundleLibraries.cmake 28 Jan 2010 21:48:02 -0000 1.3.4.1
***************
*** 211,215 ****
string(REGEX REPLACE "^(.*)\\.framework$" "\\1" fwname "${fwdirname}")
string(REGEX REPLACE "^.*/${fwname}\\.framework/(.*)$" "\\1" fwlibname "${clib_libsrc}")
! set(fw_dstdir "${clib_bundle}/Contents/Frameworks/${fwdirname}")
# message("")
--- 211,215 ----
string(REGEX REPLACE "^(.*)\\.framework$" "\\1" fwname "${fwdirname}")
string(REGEX REPLACE "^.*/${fwname}\\.framework/(.*)$" "\\1" fwlibname "${clib_libsrc}")
! set(fw_dstdir "${clib_bundle}/Contents/Frameworks")
# message("")
***************
*** 241,255 ****
)
execute_process(COMMAND install_name_tool
! -id "@executable_path/../Frameworks/${fwdirname}/${fwlibname}"
! "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}"
)
set(${clib_dstlibs} ${${clib_dstlibs}}
! "${clib_bundle}/Contents/Frameworks/${fwdirname}/${fwlibname}"
)
set(${clib_fixups} ${${clib_fixups}}
"-change"
"${clib_libsrc}"
! "@executable_path/../Frameworks/${fwdirname}/${fwlibname}"
)
else("${clib_libsrc}" MATCHES ".framework/.*/.*/.*")
--- 241,263 ----
)
+ get_filename_component(fw_src_path "${fw_src}" PATH)
+ message("Checking ${fw_src_path}/Resources")
+ if(EXISTS "${fw_src_path}/Resources")
+ message("Copy: ${CMAKE_COMMAND} -E copy_directory \"${fw_src_path}/Resources/\" \"${fw_dstdir}/Resources/\"")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
+ "${fw_src_path}/Resources/" "${fw_dstdir}/${fwdirname}/Resources/")
+ endif(EXISTS "${fw_src_path}/Resources")
+
execute_process(COMMAND install_name_tool
! -id "@executable_path/../Frameworks/${fwlibname}"
! "${clib_bundle}/Contents/Frameworks/${fwlibname}"
)
set(${clib_dstlibs} ${${clib_dstlibs}}
! "${clib_bundle}/Contents/Frameworks/${fwlibname}"
)
set(${clib_fixups} ${${clib_fixups}}
"-change"
"${clib_libsrc}"
! "@executable_path/../Frameworks/${fwlibname}"
)
else("${clib_libsrc}" MATCHES ".framework/.*/.*/.*")
Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C 2 -d -r1.24.2.2 -r1.24.2.3
*** CMakeSetup.cxx 28 Oct 2009 16:15:41 -0000 1.24.2.2
--- CMakeSetup.cxx 28 Jan 2010 21:48:02 -0000 1.24.2.3
***************
*** 135,139 ****
app.setApplicationName("CMakeSetup");
app.setOrganizationName("Kitware");
! app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png"));
CMakeSetupDialog dialog;
--- 135,142 ----
app.setApplicationName("CMakeSetup");
app.setOrganizationName("Kitware");
! QIcon appIcon;
! appIcon.addFile(":/Icons/CMakeSetup32.png");
! appIcon.addFile(":/Icons/CMakeSetup128.png");
! app.setWindowIcon(appIcon);
CMakeSetupDialog dialog;
More information about the Cmake-commits
mailing list