diff --git a/cMake/FindPySideTools.cmake b/cMake/FindPySideTools.cmake index 4d1342ff6..ca26d9f6a 100644 --- a/cMake/FindPySideTools.cmake +++ b/cMake/FindPySideTools.cmake @@ -20,7 +20,7 @@ if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR}) endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -FIND_PROGRAM(PYSIDEUIC4BINARY NAMES pyside-uic pyside-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) +FIND_PROGRAM(PYSIDEUIC4BINARY NAMES python2-pyside-uic pyside-uic pyside-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) FIND_PROGRAM(PYSIDERCC4BINARY NAMES pyside-rcc pyside-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) MACRO(PYSIDE_WRAP_UI outfiles) @@ -31,20 +31,20 @@ MACRO(PYSIDE_WRAP_UI outfiles) #ADD_CUSTOM_TARGET(${it} ALL # DEPENDS ${outfile} #) - if(WIN32) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND ${PYSIDEUIC4BINARY} ${infile} -o ${outfile} - MAIN_DEPENDENCY ${infile} - ) - else(WIN32) - # Especially on Open Build Service we don't want changing date like - # pyside-uic generates in comments at beginning. - EXECUTE_PROCESS( - COMMAND ${PYSIDEUIC4BINARY} ${infile} - COMMAND sed "/^# /d" - OUTPUT_FILE ${outfile} - ) - endif(WIN32) + if(WIN32) + ADD_CUSTOM_COMMAND(OUTPUT ${outfile} + COMMAND ${PYSIDEUIC4BINARY} ${infile} -o ${outfile} + MAIN_DEPENDENCY ${infile} + ) + else(WIN32) + # Especially on Open Build Service we don't want changing date like + # pyside-uic generates in comments at beginning. + EXECUTE_PROCESS( + COMMAND ${PYSIDEUIC4BINARY} ${infile} + COMMAND sed "/^# /d" + OUTPUT_FILE ${outfile} + ) + endif(WIN32) SET(${outfiles} ${${outfiles}} ${outfile}) ENDFOREACH(it) ENDMACRO (PYSIDE_WRAP_UI) @@ -57,20 +57,20 @@ MACRO(PYSIDE_WRAP_RC outfiles) #ADD_CUSTOM_TARGET(${it} ALL # DEPENDS ${outfile} #) - if(WIN32) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND ${PYSIDERCC4BINARY} ${infile} -o ${outfile} - MAIN_DEPENDENCY ${infile} - ) - else(WIN32) - # Especially on Open Build Service we don't want changing date like - # pyside-rcc generates in comments at beginning. - EXECUTE_PROCESS( - COMMAND ${PYSIDERCC4BINARY} ${infile} - COMMAND sed "/^# /d" - OUTPUT_FILE ${outfile} - ) - endif(WIN32) + if(WIN32) + ADD_CUSTOM_COMMAND(OUTPUT ${outfile} + COMMAND ${PYSIDERCC4BINARY} ${infile} -o ${outfile} + MAIN_DEPENDENCY ${infile} + ) + else(WIN32) + # Especially on Open Build Service we don't want changing date like + # pyside-rcc generates in comments at beginning. + EXECUTE_PROCESS( + COMMAND ${PYSIDERCC4BINARY} ${infile} + COMMAND sed "/^# /d" + OUTPUT_FILE ${outfile} + ) + endif(WIN32) SET(${outfiles} ${${outfiles}} ${outfile}) ENDFOREACH(it) ENDMACRO (PYSIDE_WRAP_RC)