diff -upr cmake.orig/files/patch-CMakeLists.txt.diff cmake/files/patch-CMakeLists.txt.diff
old
|
new
|
|
1 | | --- CMakeLists.txt 2012-10-07 15:26:05.000000000 +0200 |
2 | | +++ CMakeLists.txt 2012-10-07 15:52:38.000000000 +0200 |
3 | | @@ -527,7 +527,7 @@ |
| 1 | --- CMakeLists.txt 2013-10-11 18:37:11.000000000 +0200 |
| 2 | +++ CMakeLists.txt 2013-10-11 18:39:22.000000000 +0200 |
| 3 | @@ -528,7 +528,7 @@ if(BUILD_CursesDialog) |
4 | 4 | endif() |
5 | 5 | |
6 | 6 | if(BUILD_QtDialog) |
… |
… |
|
9 | 9 | set(CMAKE_BUNDLE_NAME |
10 | 10 | "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") |
11 | 11 | set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") |
12 | | --- Source/QtDialog/CMakeLists.txt 2012-10-07 15:26:05.000000000 +0200 |
13 | | +++ Source/QtDialog/CMakeLists.txt 2012-10-07 15:57:54.000000000 +0200 |
14 | | @@ -78,19 +78,19 @@ |
| 12 | --- Source/QtDialog/CMakeLists.txt 2013-10-11 18:37:12.000000000 +0200 |
| 13 | +++ Source/QtDialog/CMakeLists.txt 2013-10-11 18:43:24.000000000 +0200 |
| 14 | @@ -95,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} |
15 | 15 | if(WIN32) |
16 | 16 | set(SRCS ${SRCS} CMakeSetup.rc) |
17 | 17 | endif() |
… |
… |
|
20 | 20 | set(SRCS ${SRCS} CMakeSetup.icns) |
21 | 21 | set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) |
22 | 22 | set_source_files_properties(CMakeSetup.icns PROPERTIES |
23 | | MACOSX_PACKAGE_LOCATION Resources) |
24 | | endif() |
| 23 | @@ -104,13 +104,13 @@ endif() |
25 | 24 | |
26 | 25 | set(CMAKE_INCLUDE_CURRENT_DIR ON) |
27 | 26 | |
28 | 27 | -add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) |
29 | 28 | +add_executable(cmake-gui WIN32 ${SRCS}) |
30 | 29 | target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) |
| 30 | if(Qt_BIN_DIR) |
| 31 | set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR}) |
| 32 | endif() |
31 | 33 | |
32 | 34 | -if(APPLE) |
33 | 35 | +if(FALSE) |
34 | 36 | set_target_properties(cmake-gui PROPERTIES |
35 | 37 | OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) |
36 | 38 | endif() |
37 | | @@ -107,7 +107,7 @@ |
| 39 | @@ -127,7 +127,7 @@ if(UNIX) |
38 | 40 | install(FILES cmakecache.xml DESTINATION share/mime/packages ) |
39 | 41 | endif() |
40 | 42 | |
… |
… |
|
43 | 45 | set(CMAKE_POSTFLIGHT_SCRIPT |
44 | 46 | "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") |
45 | 47 | set(CMAKE_POSTUPGRADE_SCRIPT |
46 | | @@ -120,7 +120,7 @@ |
| 48 | @@ -140,7 +140,7 @@ if(APPLE) |
47 | 49 | WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") |
48 | 50 | endif() |
49 | 51 | |