From 41cc153bff1593feb94c85bb8aa025c34fc820be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Mon, 27 Jul 2015 18:54:04 -0400 Subject: [PATCH] Only check for the needed dependencies. Helpful for dropping dependencies package dependencies. - Git only needed if there is a .git folder - bzip2 only needed by CDVDiso - CG/GLEW was for zerogs and ZZogl - jpeg was for ZZogl . I also added that EGL_API is also for GSdx in option comment. --- cmake/BuildParameters.cmake | 6 +++--- cmake/SearchForStuff.cmake | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index d5ddda8413..3a1e829761 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -31,9 +31,9 @@ endif() #------------------------------------------------------------------------------- # Graphical option #------------------------------------------------------------------------------- -option(GLSL_API "Replace zzogl CG backend by GLSL (experimental option)") -option(EGL_API "Use EGL on zzogl (experimental/developer option)") -option(REBUILD_SHADER "Rebuild glsl/cg shader (developer option)") +option(GLSL_API "Replace ZZogl CG backend by GLSL (experimental option)") +option(EGL_API "Use EGL on ZZogl/GSdx (experimental/developer option)") +option(REBUILD_SHADER "Rebuild GLSL/CG shader (developer option)") option(BUILD_REPLAY_LOADERS "Build GS replayer to ease testing (developer option)") #------------------------------------------------------------------------------- diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 487d660e01..ad8d2e56c0 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -3,13 +3,13 @@ #------------------------------------------------------------------------------- ## Use cmake package to find module find_package(ALSA) -find_package(BZip2) find_package(Gettext) # translation tool -find_package(Git) -find_package(JPEG) +if(EXISTS ${PROJECT_SOURCE_DIR}/.git) + find_package(Git) +endif() find_package(LibLZMA) -find_package(PNG) find_package(OpenGL) +find_package(PNG) # The requirement of wxWidgets is checked in SelectPcsx2Plugins module # Does not require the module (allow to compile non-wx plugins) # Force the unicode build (the variable is only supported on cmake 2.8.3 and above) @@ -62,10 +62,16 @@ find_package(wxWidgets COMPONENTS base core adv) find_package(ZLIB) ## Use pcsx2 package to find module -include(FindCg) -include(FindGlew) include(FindLibc) +## Only needed by the extra plugins +if(EXTRA_PLUGINS) + find_package(BZip2) + include(FindCg) + include(FindGlew) + find_package(JPEG) +endif() + ## Use CheckLib package to find module include(CheckLib) if(Linux)