Merge commit '7fa991944298e3723641891cc49424a552b42804'

FreeCAD · Feb 22, 2015 · e8fafa1 · e8fafa1
2 parents 119d55b + 7fa9919
commit e8fafa1
Showing 1 changed file with 9 additions and 21 deletions.
diff --git 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}" )