diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-11 10:56:01 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-11 10:56:01 -0400 |
| commit | b22a464bcc91e813e2df573ea9c935354fa4b0f0 (patch) | |
| tree | 5f93715c1e20140e0911e7ae3975ee85d6731a90 | |
| parent | 0c4f1e3f80a2faafc2f22576f5e8fdf5f6033564 (diff) | |
| download | cmake-b22a464bcc91e813e2df573ea9c935354fa4b0f0.tar.gz | |
ENH: merge changs from main tree
| -rw-r--r-- | ChangeLog.manual | 2 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual index 55583369e6..22d1bf345f 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,5 +1,7 @@ Changes in CMake 2.4.2 +* Fix FindQT to be able to use full paths to source files + * Fix CPack ZIP on windows command line problem * Find executables with no extension on windows mingw diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index f9040b2f32..e5db44b37d 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -741,7 +741,7 @@ IF (QT4_QMAKE_FOUND) FOREACH (it ${ARGN}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_UIC_EXECUTABLE} @@ -760,7 +760,7 @@ IF (QT4_QMAKE_FOUND) FOREACH (it ${ARGN}) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) - SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_RCC_EXECUTABLE} |