Merge pull request #122 from kkoksvik/cmake
Helping cMake find pyside-uic in Arch Linux
This commit is contained in:
commit
056c2f1586
|
@ -20,7 +20,7 @@ if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR})
|
set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR})
|
||||||
endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
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})
|
FIND_PROGRAM(PYSIDERCC4BINARY NAMES pyside-rcc pyside-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR})
|
||||||
|
|
||||||
MACRO(PYSIDE_WRAP_UI outfiles)
|
MACRO(PYSIDE_WRAP_UI outfiles)
|
||||||
|
@ -31,20 +31,20 @@ MACRO(PYSIDE_WRAP_UI outfiles)
|
||||||
#ADD_CUSTOM_TARGET(${it} ALL
|
#ADD_CUSTOM_TARGET(${it} ALL
|
||||||
# DEPENDS ${outfile}
|
# DEPENDS ${outfile}
|
||||||
#)
|
#)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||||
COMMAND ${PYSIDEUIC4BINARY} ${infile} -o ${outfile}
|
COMMAND ${PYSIDEUIC4BINARY} ${infile} -o ${outfile}
|
||||||
MAIN_DEPENDENCY ${infile}
|
MAIN_DEPENDENCY ${infile}
|
||||||
)
|
)
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
# Especially on Open Build Service we don't want changing date like
|
# Especially on Open Build Service we don't want changing date like
|
||||||
# pyside-uic generates in comments at beginning.
|
# pyside-uic generates in comments at beginning.
|
||||||
EXECUTE_PROCESS(
|
EXECUTE_PROCESS(
|
||||||
COMMAND ${PYSIDEUIC4BINARY} ${infile}
|
COMMAND ${PYSIDEUIC4BINARY} ${infile}
|
||||||
COMMAND sed "/^# /d"
|
COMMAND sed "/^# /d"
|
||||||
OUTPUT_FILE ${outfile}
|
OUTPUT_FILE ${outfile}
|
||||||
)
|
)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
SET(${outfiles} ${${outfiles}} ${outfile})
|
SET(${outfiles} ${${outfiles}} ${outfile})
|
||||||
ENDFOREACH(it)
|
ENDFOREACH(it)
|
||||||
ENDMACRO (PYSIDE_WRAP_UI)
|
ENDMACRO (PYSIDE_WRAP_UI)
|
||||||
|
@ -57,20 +57,20 @@ MACRO(PYSIDE_WRAP_RC outfiles)
|
||||||
#ADD_CUSTOM_TARGET(${it} ALL
|
#ADD_CUSTOM_TARGET(${it} ALL
|
||||||
# DEPENDS ${outfile}
|
# DEPENDS ${outfile}
|
||||||
#)
|
#)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||||
COMMAND ${PYSIDERCC4BINARY} ${infile} -o ${outfile}
|
COMMAND ${PYSIDERCC4BINARY} ${infile} -o ${outfile}
|
||||||
MAIN_DEPENDENCY ${infile}
|
MAIN_DEPENDENCY ${infile}
|
||||||
)
|
)
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
# Especially on Open Build Service we don't want changing date like
|
# Especially on Open Build Service we don't want changing date like
|
||||||
# pyside-rcc generates in comments at beginning.
|
# pyside-rcc generates in comments at beginning.
|
||||||
EXECUTE_PROCESS(
|
EXECUTE_PROCESS(
|
||||||
COMMAND ${PYSIDERCC4BINARY} ${infile}
|
COMMAND ${PYSIDERCC4BINARY} ${infile}
|
||||||
COMMAND sed "/^# /d"
|
COMMAND sed "/^# /d"
|
||||||
OUTPUT_FILE ${outfile}
|
OUTPUT_FILE ${outfile}
|
||||||
)
|
)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
SET(${outfiles} ${${outfiles}} ${outfile})
|
SET(${outfiles} ${${outfiles}} ${outfile})
|
||||||
ENDFOREACH(it)
|
ENDFOREACH(it)
|
||||||
ENDMACRO (PYSIDE_WRAP_RC)
|
ENDMACRO (PYSIDE_WRAP_RC)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user