Ticket #27383: cmake-svn.diff

File cmake-svn.diff, 4.2 KB (added by michaelld (Michael Dickens), 14 years ago)

"svn diff" in 'cmake' dports directory

  • files/patch-Modules-FindQt4.cmake.diff

     
     1--- Modules/FindQt4.cmake.orig  2010-11-18 09:49:17.000000000 -0500
     2+++ Modules/FindQt4.cmake       2010-11-18 09:53:21.000000000 -0500
     3@@ -580,7 +580,8 @@
     4     SET(QT_MKSPECS_DIR NOTFOUND)
     5     FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
     6       HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
     7-      DOC "The location of the Qt mkspecs containing qconfig.pri")
     8+      DOC "The location of the Qt mkspecs containing qconfig.pri"
     9+      NO_DEFAULT_PATH)
     10   ENDIF()
     11 
     12   IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
     13@@ -604,12 +605,12 @@
     14     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
     15                  NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
     16                  HINTS ${QT_LIBRARY_DIR_TMP}
     17-                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
     18+                 NO_DEFAULT_PATH
     19         )
     20     FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG
     21                  NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4
     22                  HINTS ${QT_LIBRARY_DIR_TMP}
     23-                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
     24+                 NO_DEFAULT_PATH
     25         )
     26 
     27     # try dropping a hint if trying to use Visual Studio with Qt built by mingw
     28@@ -663,6 +664,7 @@
     29                 HINTS ${qt_headers}
     30                 ${QT_LIBRARY_DIR}/QtCore.framework/Headers
     31                 PATH_SUFFIXES QtCore
     32+               NO_DEFAULT_PATH
     33         )
     34 
     35       # Set QT_HEADERS_DIR based on finding QtCore header
     36@@ -711,7 +713,8 @@
     37     endforeach(qt_cross_path)
     38     FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
     39       HINTS ${qt_cross_paths} ${qt_plugins_dir}
     40-      DOC "The location of the Qt plugins")
     41+      DOC "The location of the Qt plugins"
     42+      NO_DEFAULT_PATH)
     43   ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
     44 
     45   # ask qmake for the translations directory
     46@@ -731,8 +734,7 @@
     47       FIND_PATH(QT_IMPORTS_DIR NAMES Qt
     48         HINTS ${qt_cross_paths} ${qt_imports_dir}
     49         DOC "The location of the Qt imports"
     50-        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
     51-        NO_CMAKE_SYSTEM_PATH)
     52+        NO_DEFAULT_PATH)
     53       mark_as_advanced(QT_IMPORTS_DIR)
     54     endif(qt_imports_dir)
     55   ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR  OR  QT_QMAKE_CHANGED)
  • files/macports.cmake

     
    1 # Use ncurses to use the MacPorts ncurses
    2 set(CURSES_USE_NCURSES TRUE)
    3 set(CURSES_NEED_NCURSES TRUE)
    4 set(CURSES_CURSES_LIBRARY ${CURSES_NCURSES_LIBRARY})
     1# Coerce CMake to use the MacPorts ncurses library
     2# patch __PREFIX__ in the Portfile post-patch stage
     3set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
  • Portfile

     
    66
    77name            cmake
    88version         2.8.3
     9revision    1
    910set branch      [join [lrange [split ${version} .] 0 1] .]
    1011categories      devel
    1112maintainers     css
     
    3132
    3233configure.args  --mandir=/share/man --docdir=/share/doc/cmake \
    3334                                --parallel=${build.jobs} \
    34                                 --init=${filespath}/macports.cmake
    35 patchfiles      patch-CMakeFindFrameworks.cmake.diff
     35                                --init=${worksrcpath}/macports.cmake
     36configure.universal_args
     37configure.post_args
     38
     39patchfiles      patch-CMakeFindFrameworks.cmake.diff \
     40            patch-Modules-FindQt4.cmake.diff
     41
    3642post-patch {
     43    # copy cmake init file, ready to be patched below
     44    copy ${filespath}/macports.cmake ${worksrcpath}
     45
     46    # patch PREFIX
     47        reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/macports.cmake
    3748        reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
    3849}
    3950
     
    4758                } else {
    4859                        set dirs ${worksrcpath}
    4960                }
    50                 foreach dir ${dirs} {
    51                         reinplace "s|/usr/lib/libcurses|${prefix}/lib/libncurses|g" ${dir}/CMakeCache.txt
    52                 }
    5361        }
    5462}
    5563