Ticket #40746: fix-cmake-port.diff

File fix-cmake-port.diff, 2.3 KB (added by maehne (Torsten Maehne), 11 years ago)

Patch for cmake port

  • files/patch-CMakeLists.txt.diff

    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)
    44 endif()
    55 
    66 if(BUILD_QtDialog)
     
    99     set(CMAKE_BUNDLE_NAME
    1010       "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
    1111     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}
    1515 if(WIN32)
    1616   set(SRCS ${SRCS} CMakeSetup.rc)
    1717 endif()
     
    2020   set(SRCS ${SRCS} CMakeSetup.icns)
    2121   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    2222   set_source_files_properties(CMakeSetup.icns PROPERTIES
    23      MACOSX_PACKAGE_LOCATION Resources)
    24  endif()
     23@@ -104,13 +104,13 @@ endif()
    2524 
    2625 set(CMAKE_INCLUDE_CURRENT_DIR ON)
    2726 
    2827-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
    2928+add_executable(cmake-gui WIN32 ${SRCS})
    3029 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()
    3133 
    3234-if(APPLE)
    3335+if(FALSE)
    3436   set_target_properties(cmake-gui PROPERTIES
    3537     OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
    3638 endif()
    37 @@ -107,7 +107,7 @@
     39@@ -127,7 +127,7 @@ if(UNIX)
    3840   install(FILES cmakecache.xml DESTINATION share/mime/packages )
    3941 endif()
    4042 
     
    4345   set(CMAKE_POSTFLIGHT_SCRIPT
    4446     "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
    4547   set(CMAKE_POSTUPGRADE_SCRIPT
    46 @@ -120,7 +120,7 @@
     48@@ -140,7 +140,7 @@ if(APPLE)
    4749                 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
    4850 endif()
    4951