Bläddra i källkod

ENH: fix for bug 3216 allow full path to qt input files

Bill Hoffman 19 år sedan
förälder
incheckning
6e64163019
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2 2
      Modules/FindQt4.cmake

+ 2 - 2
Modules/FindQt4.cmake

@@ -741,7 +741,7 @@ IF (QT4_QMAKE_FOUND)
 
 
     FOREACH (it ${ARGN})
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
       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)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_UIC_EXECUTABLE}
         COMMAND ${QT_UIC_EXECUTABLE}
@@ -760,7 +760,7 @@ IF (QT4_QMAKE_FOUND)
 
 
     FOREACH (it ${ARGN})
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
       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)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}
         COMMAND ${QT_RCC_EXECUTABLE}