From 7fa991944298e3723641891cc49424a552b42804 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Sat, 24 Jan 2015 10:31:54 -0800 Subject: [PATCH] Add python bin dir as hint for finding PySide tools (On OS X and Windows) This should handle most situations --- cMake/FindPySideTools.cmake | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/cMake/FindPySideTools.cmake b/cMake/FindPySideTools.cmake index 4c4bfd280a84..0a2caae5da87 100644 --- a/cMake/FindPySideTools.cmake +++ b/cMake/FindPySideTools.cmake @@ -14,27 +14,15 @@ IF(PYSIDEUIC4BINARY AND PYSIDERCC4BINARY) set(PYSIDE_TOOLS_FOUND_QUIETLY TRUE) ENDIF(PYSIDEUIC4BINARY AND PYSIDERCC4BINARY) -if(WIN32) - FIND_PROGRAM(PYSIDEUIC4BINARY pyside-uic - HINTS ${PYSIDE_BIN_DIR} - ) - FIND_PROGRAM(PYSIDERCC4BINARY pyside-rcc - HINTS ${PYSIDE_BIN_DIR} - ) -else(WIN32) - if(APPLE) - #set (PYTHON_BIN_DIR /opt/local/Library/Frameworks/Python.framework/Versions/2.7/bin ) - FIND_PROGRAM( PYSIDEUIC4BINARY PYSIDEUIC4 - HINTS ${PYSIDE_BIN_DIR} - ) - FIND_PROGRAM(PYSIDERCC4BINARY PYSIDERCC4 - HINTS ${PYSIDE_BIN_DIR} - ) - else(APPLE) - FIND_PROGRAM(PYSIDEUIC4BINARY pyside-uic) - FIND_PROGRAM(PYSIDERCC4BINARY pyside-rcc) - endif(APPLE) -endif(WIN32) +if(WIN32 OR APPLE) + #pyside tools are often in same location as python interpreter + get_filename_component(PYTHON_BIN_DIR ${PYTHON_EXECUTABLE} PATH) + set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR}) +endif(WIN32 OR APPLE) + +FIND_PROGRAM(PYSIDEUIC4BINARY pyside-uic HINTS ${PYSIDE_BIN_DIR}) +FIND_PROGRAM(PYSIDERCC4BINARY pyside-rcc HINTS ${PYSIDE_BIN_DIR}) + #message(STATUS "PYSIDEUIC4BINARY ${PYSIDEUIC4BINARY}" ) #message(STATUS "PYSIDERCC4BINARY ${PYSIDERCC4BINARY}" )