Commit b22a464b authored by Bill Hoffman's avatar Bill Hoffman

ENH: merge changs from main tree

parent 0c4f1e3f
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
......
......@@ -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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment