diff --git a/CMakeLists.txt b/CMakeLists.txt index b56e7470e7..f7c32904bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,9 @@ include_directories(${PROJECT_SOURCE_DIR}/common/include ${PROJECT_SOURCE_DIR}/common/include/x86emitter) # make 3rdParty -add_subdirectory(3rdparty) +if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty") + add_subdirectory(3rdparty) +endif(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty") # make common if(common_libs) @@ -43,12 +45,14 @@ endif(common_libs) add_subdirectory(tools) # make pcsx2 -if(pcsx2_core) +if(EXISTS "${PROJECT_SOURCE_DIR}/pcsx2" AND pcsx2_core) add_subdirectory(pcsx2) -endif(pcsx2_core) +endif(EXISTS "${PROJECT_SOURCE_DIR}/pcsx2" AND pcsx2_core) # make plugins -add_subdirectory(plugins) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins") + add_subdirectory(plugins) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins") #------------------------------------------------------------------------------- # Resources diff --git a/cmake/FindSoundTouch.cmake b/cmake/FindSoundTouch.cmake index 69f97228a6..f8234aa45a 100644 --- a/cmake/FindSoundTouch.cmake +++ b/cmake/FindSoundTouch.cmake @@ -13,9 +13,8 @@ endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES) find_path(SOUNDTOUCH_INCLUDE_DIR soundtouch/SoundTouch.h) # finally the library itself -find_library(libBPM NAMES BPM) find_library(libSoundTouch NAMES SoundTouch) -set(SOUNDTOUCH_LIBRARIES ${libBPM} ${libSoundTouch}) +set(SOUNDTOUCH_LIBRARIES ${libSoundTouch}) # handle the QUIETLY and REQUIRED arguments and set SOUNDTOUCH_FOUND to TRUE if # all listed variables are TRUE diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 003c249b24..9d17cf2e7e 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -46,9 +46,7 @@ if(NOT ZLIB_FOUND OR FORCE_INTERNAL_ZLIB) set(ZLIB_FOUND TRUE) # Set path set(ZLIB_LIBRARIES zlib) - # XXX Need to be updated when repository will be updated - # For the moment include are done with the last fallback in bottom of the file - # include_directories(${PROJECT_SOURCE_DIR}/3rdparty/zlib) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/zlib) endif(NOT ZLIB_FOUND OR FORCE_INTERNAL_ZLIB) if(NOT BZIP2_FOUND OR FORCE_INTERNAL_BZIP2) @@ -57,9 +55,7 @@ if(NOT BZIP2_FOUND OR FORCE_INTERNAL_BZIP2) set(BZIP2_FOUND TRUE) # Set path set(BZIP2_LIBRARIES bzip2) - # XXX Need to be updated when repository will be updated - # For the moment include are done with the last fallback in bottom of the file - # include_directories(${PROJECT_SOURCE_DIR}/3rdparty/bzip) + include_directories(${PROJECT_SOURCE_DIR}/3rdparty/bzip2) endif(NOT BZIP2_FOUND OR FORCE_INTERNAL_BZIP2) if(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 95f2605661..f0b8caf9a9 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,122 +1,122 @@ # Plugins # make cdvdGigaherz -#if(cdvdGigaherz) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/cdvdGigaherz" AND cdvdGigaherz) # add_subdirectory(cdvdGigaherz) -#endif(cdvdGigaherz) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/cdvdGigaherz" AND cdvdGigaherz) # make CDVDiso -if(CDVDiso) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDiso" AND CDVDiso) add_subdirectory(CDVDiso) -endif(CDVDiso) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDiso" AND CDVDiso) # make CDVDisoEFP -if(CDVDisoEFP) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDisoEFP" AND CDVDisoEFP) add_subdirectory(CDVDisoEFP) -endif(CDVDisoEFP) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDisoEFP" AND CDVDisoEFP) # make CDVDlinuz -if(CDVDlinuz) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDlinuz" AND CDVDlinuz) add_subdirectory(CDVDlinuz) -endif(CDVDlinuz) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDlinuz" AND CDVDlinuz) # make CDVDnull -if(CDVDnull) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDnull" AND CDVDnull) add_subdirectory(CDVDnull) -endif(CDVDnull) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDnull" AND CDVDnull) # make CDVDolio -if(CDVDolio) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDolio" AND CDVDolio) add_subdirectory(CDVDolio) -endif(CDVDolio) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDolio" AND CDVDolio) # make CDVDpeops -#if(CDVDpeops) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDpeops" AND CDVDpeops) # add_subdirectory(CDVDpeops) -#endif(CDVDpeops) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/CDVDpeops" AND CDVDpeops) # make dev9null -if(dev9null) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/dev9null" AND dev9null) add_subdirectory(dev9null) -endif(dev9null) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/dev9null" AND dev9null) # make FWnull -if(FWnull) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/FWnull" AND FWnull) add_subdirectory(FWnull) -endif(FWnull) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/FWnull" AND FWnull) # make GSdx -#if(GSdx) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/GSdx" AND GSdx) # add_subdirectory(GSdx) -#endif(GSdx) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/GSdx" AND GSdx) # make GSnull -if(GSnull) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/GSnull" AND GSnull) add_subdirectory(GSnull) -endif(GSnull) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/GSnull" AND GSnull) # make LilyPad -#if(LilyPad) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/LilyPad" AND LilyPad) # add_subdirectory(LilyPad) -#endif(LilyPad) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/LilyPad" AND LilyPad) # make onepad -if(onepad) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/onepad" AND onepad) add_subdirectory(onepad) -endif(onepad) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/onepad" AND onepad) # make PadNull -if(PadNull) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/PadNull" AND PadNull) add_subdirectory(PadNull) -endif(PadNull) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/PadNull" AND PadNull) # make PeopsSPU2 -if(PeopsSPU2) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/PeopsSPU2" AND PeopsSPU2) add_subdirectory(PeopsSPU2) -endif(PeopsSPU2) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/PeopsSPU2" AND PeopsSPU2) # make SPU2null -if(SPU2null) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/SPU2null" AND SPU2null) add_subdirectory(SPU2null) -endif(SPU2null) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/SPU2null" AND SPU2null) # make spu2-x -if(spu2-x) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/spu2-x" AND spu2-x) add_subdirectory(spu2-x) -endif(spu2-x) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/spu2-x" AND spu2-x) # make SSSPSXPAD -#if(SSSPSXPAD) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/SSSPSXPAD" AND SSSPSXPAD) # add_subdirectory(SSSPSXPAD) -#endif(SSSPSXPAD) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/SSSPSXPAD" AND SSSPSXPAD) # make USBnull -if(USBnull) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/USBnull" AND USBnull) add_subdirectory(USBnull) -endif(USBnull) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/USBnull" AND USBnull) # make xpad -#if(xpad) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/xpad" AND xpad) # add_subdirectory(xpad) -#endif(xpad) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/xpad" AND xpad) # make zerogs -#if(zerogs) +#if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zerogs" AND zerogs) # add_subdirectory(zerogs) -#endif(zerogs) +#endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zerogs" AND zerogs) # make zzogl-pg -if(zzogl) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zzogl-pg" AND zzogl) add_subdirectory(zzogl-pg) -endif(zzogl) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zzogl-pg" AND zzogl) # make zeropad -if(zeropad) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zeropad" AND zeropad) add_subdirectory(zeropad) -endif(zeropad) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zeropad" AND zeropad) # make zerospu2 -if(zerospu2) +if(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zerospu2" AND zerospu2) add_subdirectory(zerospu2) -endif(zerospu2) +endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins/zerospu2" AND zerospu2)