Ticket #37523: patch-CMakeLists.txt.diff

File patch-CMakeLists.txt.diff, 1.7 KB (added by barrettsa@…, 11 years ago)

Fixed version of patch file.

  • CMakeLists.txt

     
    527527endif()
    528528
    529529if(BUILD_QtDialog)
    530   if(APPLE)
     530  if(FALSE)
    531531    set(CMAKE_BUNDLE_NAME
    532532      "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
    533533    set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
  • Source/QtDialog/CMakeLists.txt

     
    7878if(WIN32)
    7979  set(SRCS ${SRCS} CMakeSetup.rc)
    8080endif()
    81 if(APPLE)
     81if(FALSE)
    8282  set(SRCS ${SRCS} CMakeSetup.icns)
    8383  set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    8484  set_source_files_properties(CMakeSetup.icns PROPERTIES
    8585    MACOSX_PACKAGE_LOCATION Resources)
    8686endif()
    8787
    8888set(CMAKE_INCLUDE_CURRENT_DIR ON)
    8989
    90 add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
     90add_executable(cmake-gui WIN32 ${SRCS})
    9191target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
    9292
    93 if(APPLE)
     93if(FALSE)
    9494  set_target_properties(cmake-gui PROPERTIES
    9595    OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
    9696endif()
     
    107107  install(FILES cmakecache.xml DESTINATION share/mime/packages )
    108108endif()
    109109
    110 if(APPLE)
     110if(FALSE)
    111111  set(CMAKE_POSTFLIGHT_SCRIPT
    112112    "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
    113113  set(CMAKE_POSTUPGRADE_SCRIPT
     
    120120                WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
    121121endif()
    122122
    123 if(APPLE OR WIN32)
     123if(WIN32)
    124124  # install rules for including 3rd party libs such as Qt
    125125  # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
    126126  set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")