Ticket #28520: patch-CMakeLists.txt-NEW.diff

File patch-CMakeLists.txt-NEW.diff, 3.2 KB (added by Ionic (Mihai Moldovan), 14 years ago)

Updated GUI patch, fixes patch and compile failures.

  • CMakeLists.txt

    diff -ur cmake-2.8.4-orig/CMakeLists.txt cmake-2.8.4/CMakeLists.txt
     
    547547ENDIF(BUILD_CursesDialog)
    548548
    549549IF(BUILD_QtDialog)
    550   IF(APPLE)
     550  IF(FALSE)
    551551    SET(CMAKE_BUNDLE_NAME
    552552      "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
    553553    SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
     
    560560    ENDIF(NOT "${ENDCH}" STREQUAL "/")
    561561    SET(CMAKE_INSTALL_PREFIX
    562562      "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
    563   ENDIF(APPLE)
     563  ENDIF(FALSE)
    564564 
    565565  SET(QT_NEED_RPATH FALSE)
    566566  IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
  • Source/QtDialog/CMakeLists.txt

    diff -ur cmake-2.8.4-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.4/Source/QtDialog/CMakeLists.txt
     
    5959  IF(Q_WS_WIN)
    6060    SET(SRCS ${SRCS} CMakeSetup.rc)
    6161  ENDIF(Q_WS_WIN)
    62   IF(Q_WS_MAC)
     62  IF(FALSE)
    6363    SET(SRCS ${SRCS} CMakeSetup.icns)
    6464    SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    6565    SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
    6666      MACOSX_PACKAGE_LOCATION Resources)
    67   ENDIF(Q_WS_MAC)
     67  ENDIF(FALSE)
    6868
    6969  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
    7070  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
    7171
    72   ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
     72  ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS})
    7373  TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
    7474  IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
    75     IF(APPLE)
     75    IF(FALSE)
    7676      SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
    7777       OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
    78     ENDIF(APPLE)
     78    ENDIF(FALSE)
    7979    SET(CMAKE_INSTALL_DESTINATION_ARGS
    8080      BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
    8181  ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
     
    9090    INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
    9191  ENDIF(UNIX)
    9292
    93   IF(APPLE)
     93  IF(FALSE)
    9494    SET(CMAKE_POSTFLIGHT_SCRIPT
    9595      "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
    9696    SET(CMAKE_POSTUPGRADE_SCRIPT
     
    101101      "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
    102102    INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
    103103                  WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
    104   ENDIF(APPLE)
     104  ENDIF(FALSE)
    105105
    106   if(APPLE OR WIN32)
     106  if(WIN32)
    107107    # install rules for including 3rd party libs such as Qt
    108108    # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
    109109    set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
     
    114114      include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
    115115      fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
    116116    ")
    117   endif(APPLE OR WIN32)
     117  endif(WIN32)
    118118
    119119  CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
    120120    "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)