Opened 13 years ago

Closed 13 years ago

#30504 closed update (fixed)

Update cmake to 2.8.5

Reported by: cssdev Owned by: cssdev
Priority: Normal Milestone:
Component: ports Version: 1.9.2
Keywords: Cc:
Port: cmake

Description

The ​new version of cmake is available, but 2.8.5 makes some changes to the Qt module that conflicts with included patches. 

--->  Applying /Users/Shared/macports/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
patching file Modules/FindQt4.cmake
Hunk #1 succeeded at 526 (offset -57 lines).
Hunk #2 FAILED at 551.
Hunk #3 succeeded at 622 with fuzz 2 (offset -45 lines).
Hunk #4 succeeded at 675 (offset -41 lines).
Hunk #5 succeeded at 696 (offset -41 lines).
1 out of 5 hunks FAILED -- saving rejects to file Modules/FindQt4.cmake.rej
shell command " cd "/opt/local/var/macports/build/_Users_Shared_macports_dports_devel_cmake/work/cmake-2.8.5" && /usr/bin/patch -p0 < '/Users/Shared/macports/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff'" returned error 1
Error: Target org.macports.patch returned: shell command failed (see log for details)

Change History (2)

comment:1 Changed 13 years ago by cssdev

Status: new → assigned

It looks like QT_QTCORE_LIBRARY_RELEASE and QT_QTCORE_LIBRARY_DEBUG have NO_DEFAULT_PATH set now. I removed that hunk from the patch, and it patches properly now.

comment:2 Changed 13 years ago by cssdev

Resolution: → fixed
Status: assigned → closed

Committed to r81498

Note: See TracTickets for help on using tickets.