Merge pull request #43 from a17r/cmake

CMake warning fixes

Author: Capostrophic

CMakeLists.txt

@@ -226,7 +226,6 @@ IF (OSG_MAINTAINER)
 
 ENDIF()
 
-IF(NOT ANDROID)
 IF(APPLE)
 
     IF(OSG_BUILD_PLATFORM_IPHONE)
@@ -271,12 +270,11 @@ IF(APPLE)
 
     OPTION(OSG_COMPILE_FRAMEWORKS "compile frameworks instead of dylibs (experimental)" OFF)
     SET(OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR "@executable_path/../Frameworks" CACHE STRING "install name dir for compiled frameworks")
-ELSE()
+ELSEIF(NOT ANDROID)
     # Non-Apple: Find OpenGL
     FIND_PACKAGE(OpenGL)
     FIND_PACKAGE(EGL)
 ENDIF()
-ENDIF()
 
 
 

CMakeModules/FindGTA.cmake

@@ -8,15 +8,10 @@
 # correspond to the ./configure --prefix=$GTA_DIR
 # used in building libgta.
 
-INCLUDE(FindPkgConfig OPTIONAL)
-
-IF(PKG_CONFIG_FOUND)
-
-    INCLUDE(FindPkgConfig)
-
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
     PKG_CHECK_MODULES(GTA gta)
-
-ENDIF(PKG_CONFIG_FOUND)
+endif()
 
 IF(NOT GTA_FOUND)
     FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
@@ -54,4 +49,4 @@ IF(NOT GTA_FOUND)
         SET(GTA_FOUND "YES")
     ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
 
-ENDIF(NOT GTA_FOUND)
+ENDIF(NOT GTA_FOUND)

CMakeModules/FindPoppler-glib.cmake

@@ -1,10 +1,7 @@
 #use pkg-config to find various modues
-INCLUDE(FindPkgConfig OPTIONAL)
-
-IF(PKG_CONFIG_FOUND)
-
-    INCLUDE(FindPkgConfig)
+find_package(PkgConfig QUIET)
 
+IF(PkgConfig_FOUND)
     PKG_CHECK_MODULES(CAIRO cairo)
     PKG_CHECK_MODULES(POPPLER poppler-glib)
 

CMakeModules/FindRSVG.cmake

@@ -1,10 +1,7 @@
 #use pkg-config to find various modues
-INCLUDE(FindPkgConfig OPTIONAL)
-
-IF(PKG_CONFIG_FOUND)
-
-    INCLUDE(FindPkgConfig)
+find_package(PkgConfig QUIET)
 
+IF(PkgConfig_FOUND)
     #Version 2.35 introduces the rsvg_cleanup function which is used
     PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35)