Ticket #37523: patch-CMakeLists.txt.diff
File patch-CMakeLists.txt.diff, 1.7 KB (added by barrettsa@…, 12 years ago) |
---|
-
CMakeLists.txt
527 527 endif() 528 528 529 529 if(BUILD_QtDialog) 530 if( APPLE)530 if(FALSE) 531 531 set(CMAKE_BUNDLE_NAME 532 532 "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") 533 533 set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") -
Source/QtDialog/CMakeLists.txt
78 78 if(WIN32) 79 79 set(SRCS ${SRCS} CMakeSetup.rc) 80 80 endif() 81 if( APPLE)81 if(FALSE) 82 82 set(SRCS ${SRCS} CMakeSetup.icns) 83 83 set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) 84 84 set_source_files_properties(CMakeSetup.icns PROPERTIES 85 85 MACOSX_PACKAGE_LOCATION Resources) 86 86 endif() 87 87 88 88 set(CMAKE_INCLUDE_CURRENT_DIR ON) 89 89 90 add_executable(cmake-gui WIN32 MACOSX_BUNDLE${SRCS})90 add_executable(cmake-gui WIN32 ${SRCS}) 91 91 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) 92 92 93 if( APPLE)93 if(FALSE) 94 94 set_target_properties(cmake-gui PROPERTIES 95 95 OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) 96 96 endif() … … 107 107 install(FILES cmakecache.xml DESTINATION share/mime/packages ) 108 108 endif() 109 109 110 if( APPLE)110 if(FALSE) 111 111 set(CMAKE_POSTFLIGHT_SCRIPT 112 112 "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") 113 113 set(CMAKE_POSTUPGRADE_SCRIPT … … 120 120 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") 121 121 endif() 122 122 123 if( APPLE ORWIN32)123 if(WIN32) 124 124 # install rules for including 3rd party libs such as Qt 125 125 # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation 126 126 set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")