Merge pull request #1049 from lynxlynxlynx/master

Two build fixes for Arch
qgis · Jan 15, 2014 · 11ca7fa · 11ca7fa
2 parents 89a774a + 0f8a99e
commit 11ca7fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/FindQwtPolar.cmake b/cmake/FindQwtPolar.cmake
@@ -18,7 +18,7 @@ FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS
   /usr/local/include
   "$ENV{LIB_DIR}/include" 
   "$ENV{INCLUDE}" 
-  PATH_SUFFIXES qwtpolar
+  PATH_SUFFIXES qwtpolar qwt
   )
 
 FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS 

diff --git a/cmake/PyQt4Macros.cmake b/cmake/PyQt4Macros.cmake
@@ -12,7 +12,7 @@ IF(NOT PYUIC4_PROGRAM)
       PATHS $ENV{LIB_DIR}/bin
     )
   ELSE(MSVC)
-    FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)
+    FIND_PROGRAM(PYUIC4_PROGRAM NAMES python2-pyuic4 pyuic4)
   ENDIF (MSVC)
 
   IF (NOT PYUIC4_PROGRAM)