[101261] trunk/dports/devel/cmake

Mon Jan 7 05:46:26 PST 2013

Revision: 101261
          https://trac.macports.org/changeset/101261
Author:   css at macports.org
Date:     2013-01-07 05:46:26 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
cmake: fix building +gui. refs #37523

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

Modified: trunk/dports/devel/cmake/Portfile
===================================================================

--- trunk/dports/devel/cmake/Portfile	2013-01-07 13:44:50 UTC (rev 101260)
+++ trunk/dports/devel/cmake/Portfile	2013-01-07 13:46:26 UTC (rev 101261)
@@ -6,6 +6,7 @@
 
 name		cmake
 version		2.8.10
+revision	1
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	devel
 license		BSD

Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2013-01-07 13:44:50 UTC (rev 101260)
+++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2013-01-07 13:46:26 UTC (rev 101261)
@@ -1,82 +1,54 @@
 --- CMakeLists.txt	2012-10-07 15:26:05.000000000 +0200
 +++ CMakeLists.txt	2012-10-07 15:52:38.000000000 +0200
-@@ -528,7 +528,7 @@
- ENDIF(BUILD_CursesDialog)
+@@ -527,7 +527,7 @@
+ endif()
  
- IF(BUILD_QtDialog)
--  IF(APPLE)
-+  IF(FALSE)
-     SET(CMAKE_BUNDLE_NAME
+ if(BUILD_QtDialog)
+-  if(APPLE)
++  if(FALSE)
+     set(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
-     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -541,7 +541,7 @@
-     ENDIF(NOT "${ENDCH}" STREQUAL "/")
-     SET(CMAKE_INSTALL_PREFIX 
-       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
--  ENDIF(APPLE)
-+  ENDIF(FALSE)
-   
-   SET(QT_NEED_RPATH FALSE)
-   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")
-diff -u -r cmake-2.8.9-orig/Modules/CMakeFindFrameworks.cmake cmake-2.8.9/Modules/CMakeFindFrameworks.cmake
+     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
-@@ -59,23 +59,23 @@
-   IF(Q_WS_WIN)
-     SET(SRCS ${SRCS} CMakeSetup.rc)
-   ENDIF(Q_WS_WIN)
--  IF(Q_WS_MAC)
-+  IF(FALSE)
-     SET(SRCS ${SRCS} CMakeSetup.icns)
-     SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
-     SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
-       MACOSX_PACKAGE_LOCATION Resources)
--  ENDIF(Q_WS_MAC)
-+  ENDIF(FALSE)
+@@ -78,19 +78,19 @@
+ if(WIN32)
+   set(SRCS ${SRCS} CMakeSetup.rc)
+ endif()
+-if(APPLE)
++if(FALSE)
+   set(SRCS ${SRCS} CMakeSetup.icns)
+   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+   set_source_files_properties(CMakeSetup.icns PROPERTIES
+     MACOSX_PACKAGE_LOCATION Resources)
+ endif()
  
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 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(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
--    IF(APPLE)
-+    IF(FALSE)
-       SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
-        OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
--    ENDIF(APPLE)
-+    ENDIF(FALSE)
-     SET(CMAKE_INSTALL_DESTINATION_ARGS
-       BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
-   ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
-@@ -90,7 +90,7 @@
-     INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
-   ENDIF(UNIX)
+-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(APPLE)
-+  IF(FALSE)
-     SET(CMAKE_POSTFLIGHT_SCRIPT
-       "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-     SET(CMAKE_POSTUPGRADE_SCRIPT
-@@ -101,9 +101,9 @@
-       "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
-     INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
-                   WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
--  ENDIF(APPLE)
-+  ENDIF(FALSE)
+-if(APPLE)
++if(FALSE)
+   set_target_properties(cmake-gui PROPERTIES
+     OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+ endif()
+@@ -107,7 +107,7 @@
+   install(FILES cmakecache.xml DESTINATION share/mime/packages )
+ endif()
  
--  if(APPLE OR WIN32)
-+  if(WIN32)
-     # install rules for including 3rd party libs such as Qt
-     # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
-     set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
-@@ -115,7 +115,7 @@
-       set(BU_CHMOD_BUNDLE_ITEMS ON)
-       fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
-     ")
--  endif(APPLE OR WIN32)
-+  endif(WIN32)
+-if(APPLE)
++if(FALSE)
+   set(CMAKE_POSTFLIGHT_SCRIPT
+     "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
+   set(CMAKE_POSTUPGRADE_SCRIPT
+@@ -120,7 +120,7 @@
+                 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
+ endif()
  
-   CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
-     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
+-if(APPLE OR WIN32)
++if(WIN32)
+   # install rules for including 3rd party libs such as Qt
+   # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
+   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/48a2c617/attachment-0001.html>
