[112193] trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff

[css at macports.org]

Revision: 112193
          https://trac.macports.org/changeset/112193
Author:   css at macports.org
Date:     2013-10-14 18:47:33 -0700 (Mon, 14 Oct 2013)
Log Message:
-----------
cmake: fix gui variant. refs #40746

Modified Paths:
--------------
    trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2013-10-14 23:53:50 UTC (rev 112192)
+++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2013-10-15 01:47:33 UTC (rev 112193)
@@ -1,6 +1,6 @@
---- CMakeLists.txt	2012-10-07 15:26:05.000000000 +0200
-+++ CMakeLists.txt	2012-10-07 15:52:38.000000000 +0200
-@@ -527,7 +527,7 @@
+--- CMakeLists.txt	2013-10-11 18:37:11.000000000 +0200
++++ CMakeLists.txt	2013-10-11 18:39:22.000000000 +0200
+@@ -528,7 +528,7 @@ if(BUILD_CursesDialog)
  endif()
  
  if(BUILD_QtDialog)
@@ -9,9 +9,9 @@
      set(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
      set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
---- Source/QtDialog/CMakeLists.txt	2012-10-07 15:26:05.000000000 +0200
-+++ Source/QtDialog/CMakeLists.txt	2012-10-07 15:57:54.000000000 +0200
-@@ -78,19 +78,19 @@
+--- Source/QtDialog/CMakeLists.txt	2013-10-11 18:37:12.000000000 +0200
++++ Source/QtDialog/CMakeLists.txt	2013-10-11 18:43:24.000000000 +0200
+@@ -95,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} 
  if(WIN32)
    set(SRCS ${SRCS} CMakeSetup.rc)
  endif()
@@ -20,21 +20,23 @@
    set(SRCS ${SRCS} CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-     MACOSX_PACKAGE_LOCATION Resources)
- endif()
+@@ -104,13 +104,13 @@ endif()
  
  set(CMAKE_INCLUDE_CURRENT_DIR ON)
  
 -add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
 +add_executable(cmake-gui WIN32 ${SRCS})
  target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+ if(Qt_BIN_DIR)
+   set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
+ endif()
  
 -if(APPLE)
 +if(FALSE)
    set_target_properties(cmake-gui PROPERTIES
      OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
  endif()
-@@ -107,7 +107,7 @@
+@@ -127,7 +127,7 @@ if(UNIX)
    install(FILES cmakecache.xml DESTINATION share/mime/packages )
  endif()
  
@@ -43,7 +45,7 @@
    set(CMAKE_POSTFLIGHT_SCRIPT
      "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
    set(CMAKE_POSTUPGRADE_SCRIPT
-@@ -120,7 +120,7 @@
+@@ -140,7 +140,7 @@ if(APPLE)
                  WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
  endif()
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131014/2e080a8e/attachment-0001.html>