From 87c18fbbc532fd7e92eeec209a3ff559757548eb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Feb 2020 01:16:55 +1100 Subject: CMake: remove non-standard package search paths Reduce the number of possible locations used to find libraries, to simplify troubleshooting. Only keep '*_ROOT_DIR' and the path used by 'install_deps.sh'. --- build_files/build_environment/patches/cmake/modules/FindBlosc.cmake | 3 --- .../build_environment/patches/cmake/modules/FindCppUnit.cmake | 3 --- .../build_environment/patches/cmake/modules/FindIlmBase.cmake | 2 -- .../build_environment/patches/cmake/modules/FindLogC4Plus.cmake | 3 --- .../build_environment/patches/cmake/modules/FindOpenEXR.cmake | 2 -- build_files/build_environment/patches/cmake/modules/FindTBB.cmake | 3 --- build_files/cmake/Modules/FindAlembic.cmake | 3 --- build_files/cmake/Modules/FindAudaspace.cmake | 3 --- build_files/cmake/Modules/FindBlosc.cmake | 3 --- build_files/cmake/Modules/FindEigen3.cmake | 3 --- build_files/cmake/Modules/FindEmbree.cmake | 4 ---- build_files/cmake/Modules/FindFftw3.cmake | 3 --- build_files/cmake/Modules/FindGLEW.cmake | 1 - build_files/cmake/Modules/FindGflags.cmake | 2 -- build_files/cmake/Modules/FindGlog.cmake | 2 -- build_files/cmake/Modules/FindHDF5.cmake | 3 --- build_files/cmake/Modules/FindIcuLinux.cmake | 3 --- build_files/cmake/Modules/FindJack.cmake | 3 --- build_files/cmake/Modules/FindJeMalloc.cmake | 3 --- build_files/cmake/Modules/FindLZO.cmake | 3 --- build_files/cmake/Modules/FindOpenCOLLADA.cmake | 3 --- build_files/cmake/Modules/FindOpenColorIO.cmake | 3 --- build_files/cmake/Modules/FindOpenEXR.cmake | 3 --- build_files/cmake/Modules/FindOpenGLES.cmake | 1 - build_files/cmake/Modules/FindOpenImageDenoise.cmake | 3 --- build_files/cmake/Modules/FindOpenImageIO.cmake | 3 --- build_files/cmake/Modules/FindOpenJPEG.cmake | 3 --- build_files/cmake/Modules/FindOpenShadingLanguage.cmake | 3 --- build_files/cmake/Modules/FindOpenSubdiv.cmake | 3 --- build_files/cmake/Modules/FindOpenVDB.cmake | 4 ---- build_files/cmake/Modules/FindOptiX.cmake | 3 --- build_files/cmake/Modules/FindPCRE.cmake | 3 --- build_files/cmake/Modules/FindPugiXML.cmake | 3 --- build_files/cmake/Modules/FindPythonLibsUnix.cmake | 1 - build_files/cmake/Modules/FindSDL2.cmake | 6 ------ build_files/cmake/Modules/FindSndFile.cmake | 3 --- build_files/cmake/Modules/FindSpacenav.cmake | 3 --- build_files/cmake/Modules/FindTBB.cmake | 3 --- build_files/cmake/Modules/FindUSD.cmake | 2 -- build_files/cmake/Modules/FindXML2.cmake | 3 --- 40 files changed, 114 deletions(-) (limited to 'build_files') diff --git a/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake index 8565ddc73ed..015d211b818 100644 --- a/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_blosc_SEARCH_DIRS ${BLOSC_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/blosc ) diff --git a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake index 781ec0ce6c8..80cb07ece2a 100644 --- a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_cppunit_SEARCH_DIRS ${CPPUNIT_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/cppunit ) diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake index 62ccc17d014..fed30505708 100644 --- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake @@ -124,7 +124,6 @@ set(IlmBase_generic_include_paths /usr/include /usr/include/${CMAKE_LIBRARY_ARCHITECTURE} /usr/local/include - /sw/include /opt/local/include ) set(IlmBase_generic_library_paths @@ -133,7 +132,6 @@ set(IlmBase_generic_library_paths /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} /usr/local/lib /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} - /sw/lib /opt/local/lib ) diff --git a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake index 6575cd0c763..d1a021a88bb 100644 --- a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_logc4plus_SEARCH_DIRS ${LOGC4PLUS_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/logc4plus ) diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake index 9c390d77743..2f7cae436eb 100644 --- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake @@ -119,7 +119,6 @@ set(OpenEXR_generic_include_paths /usr/include /usr/include/${CMAKE_LIBRARY_ARCHITECTURE} /usr/local/include - /sw/include /opt/local/include ) set(OpenEXR_generic_library_paths @@ -128,7 +127,6 @@ set(OpenEXR_generic_library_paths /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} /usr/local/lib /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} - /sw/lib /opt/local/lib ) diff --git a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake index c44e03b207d..de7db09ddb5 100644 --- a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_tbb_SEARCH_DIRS ${TBB_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/tbb ) diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index 59eb240804f..2d69613ad84 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -27,9 +27,6 @@ ENDIF() SET(_alembic_SEARCH_DIRS ${ALEMBIC_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/alembic ) diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index cd5116979e2..eeef49af60f 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -17,9 +17,6 @@ ENDIF() SET(_audaspace_SEARCH_DIRS ${AUDASPACE_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) # Use pkg-config to get hints about paths diff --git a/build_files/cmake/Modules/FindBlosc.cmake b/build_files/cmake/Modules/FindBlosc.cmake index 79590f11c4f..bec934ad7c3 100644 --- a/build_files/cmake/Modules/FindBlosc.cmake +++ b/build_files/cmake/Modules/FindBlosc.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_blosc_SEARCH_DIRS ${BLOSC_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/blosc ) diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index 2b23c2a6edc..82261294df2 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -25,9 +25,6 @@ ENDIF() SET(_eigen3_SEARCH_DIRS ${EIGEN3_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(EIGEN3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index cb660b98a90..d9d525d4586 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -29,10 +29,6 @@ ENDIF() SET(_embree_SEARCH_DIRS ${EMBREE_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts - /opt/embree /opt/lib/embree ) diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index 767846af015..3da19290b0d 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_fftw3_SEARCH_DIRS ${FFTW3_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(FFTW3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 593b1693fd0..652b0835807 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -28,7 +28,6 @@ ENDIF() SET(_glew_SEARCH_DIRS ${GLEW_ROOT_DIR} - /usr/local ) FIND_PATH(GLEW_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindGflags.cmake b/build_files/cmake/Modules/FindGflags.cmake index 31d951318c8..71a05b423ed 100644 --- a/build_files/cmake/Modules/FindGflags.cmake +++ b/build_files/cmake/Modules/FindGflags.cmake @@ -444,7 +444,6 @@ if(NOT GFLAGS_FOUND) /opt/local/var/macports/software # Mac OS X. /opt/local/include /usr/include - /sw/include # Fink /opt/lib/gflags/include) list(APPEND GFLAGS_CHECK_PATH_SUFFIXES @@ -457,7 +456,6 @@ if(NOT GFLAGS_FOUND) /usr/local/homebrew/lib # Mac OS X. /opt/local/lib /usr/lib - /sw/lib # Fink /opt/lib/gflags/lib) list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES gflags/lib # Windows (for C:/Program Files prefix). diff --git a/build_files/cmake/Modules/FindGlog.cmake b/build_files/cmake/Modules/FindGlog.cmake index 105d42875f6..bd1480dbaf1 100644 --- a/build_files/cmake/Modules/FindGlog.cmake +++ b/build_files/cmake/Modules/FindGlog.cmake @@ -128,7 +128,6 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS /opt/local/var/macports/software # Mac OS X. /opt/local/include /usr/include - /sw/include # Fink /opt/lib/glog/include) # Windows (for C:/Program Files prefix). list(APPEND GLOG_CHECK_PATH_SUFFIXES @@ -143,7 +142,6 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS /usr/local/homebrew/lib # Mac OS X. /opt/local/lib /usr/lib - /sw/lib # Fink /opt/lib/gflags/lib) # Windows (for C:/Program Files prefix). list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake index ed140614aa2..ea77c5d7826 100644 --- a/build_files/cmake/Modules/FindHDF5.cmake +++ b/build_files/cmake/Modules/FindHDF5.cmake @@ -26,9 +26,6 @@ ENDIF() SET(_hdf5_SEARCH_DIRS ${HDF5_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/hdf5 ) diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index 689550a17bb..9a467fa0115 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -32,9 +32,6 @@ endif() SET(_icu_SEARCH_DIRS ${ICU_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) # We don't need includes, only libs to link against... diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index dbfc30edb99..7643e586cad 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_jack_SEARCH_DIRS ${JACK_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(JACK_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 0abe103cd2e..e042e7fe43e 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_jemalloc_SEARCH_DIRS ${JEMALLOC_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/jemalloc ) diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index 6a70186150f..4db5d0f5441 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_lzo_SEARCH_DIRS ${LZO_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 45ef682cb61..acf9e9ed9ce 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -62,9 +62,6 @@ SET(_opencollada_FIND_STATIC_COMPONENTS SET(_opencollada_SEARCH_DIRS ${OPENCOLLADA_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/opencollada ) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index 218b5f721bc..090032e06ec 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -35,9 +35,6 @@ SET(_opencolorio_FIND_COMPONENTS SET(_opencolorio_SEARCH_DIRS ${OPENCOLORIO_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/ocio ) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index fa02d3f3f28..2038726863f 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -47,9 +47,6 @@ SET(_openexr_FIND_COMPONENTS SET(_openexr_SEARCH_DIRS ${OPENEXR_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/openexr ) diff --git a/build_files/cmake/Modules/FindOpenGLES.cmake b/build_files/cmake/Modules/FindOpenGLES.cmake index e3484d26ecd..daf6db61050 100644 --- a/build_files/cmake/Modules/FindOpenGLES.cmake +++ b/build_files/cmake/Modules/FindOpenGLES.cmake @@ -17,7 +17,6 @@ ENDIF() SET(_opengles_SEARCH_DIRS ${OPENGLES_ROOT_DIR} - /usr/local ) FIND_PATH(OPENGLES_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake index beaf8a0e8f4..34e4d5126b9 100644 --- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake +++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_openimagedenoise_SEARCH_DIRS ${OPENIMAGEDENOISE_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/openimagedenoise ) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 5652e1649c8..3570c982961 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -31,9 +31,6 @@ ENDIF() SET(_openimageio_SEARCH_DIRS ${OPENIMAGEIO_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/oiio ) diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index 0f1d0d0a865..5774ac2182a 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_openjpeg_SEARCH_DIRS ${OPENJPEG_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(OPENJPEG_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake index 9d9788b9900..01ed72051f7 100644 --- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake +++ b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake @@ -35,9 +35,6 @@ SET(_osl_FIND_COMPONENTS SET(_osl_SEARCH_DIRS ${OSL_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/osl ) diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index 3fca453a7a0..d7a8567a399 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -34,9 +34,6 @@ SET(_opensubdiv_FIND_COMPONENTS SET(_opensubdiv_SEARCH_DIRS ${OPENSUBDIV_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/opensubdiv /opt/lib/osd # install_deps.sh ) diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake index 510a5fab261..2a1378e3a2b 100644 --- a/build_files/cmake/Modules/FindOpenVDB.cmake +++ b/build_files/cmake/Modules/FindOpenVDB.cmake @@ -29,10 +29,6 @@ ENDIF() SET(_openvdb_SEARCH_DIRS ${OPENVDB_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts - /opt/openvdb /opt/lib/openvdb ) diff --git a/build_files/cmake/Modules/FindOptiX.cmake b/build_files/cmake/Modules/FindOptiX.cmake index 56fd2fd1396..5b606afea27 100644 --- a/build_files/cmake/Modules/FindOptiX.cmake +++ b/build_files/cmake/Modules/FindOptiX.cmake @@ -26,9 +26,6 @@ ENDIF() SET(_optix_SEARCH_DIRS ${OPTIX_ROOT_DIR} "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.0.0" - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(OPTIX_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 1fd56dc1234..dfe721920fd 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_pcre_SEARCH_DIRS ${PCRE_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(PCRE_INCLUDE_DIR pcre.h diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 629069c9032..73d7b9ef92c 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_pugixml_SEARCH_DIRS ${PUGIXML_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/oiio ) diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 966ac9a4459..0e3ecac14f0 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -71,7 +71,6 @@ STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) SET(_python_SEARCH_DIRS ${PYTHON_ROOT_DIR} "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}" - "/opt/py${_PYTHON_VERSION_NO_DOTS}" "/opt/lib/python-${PYTHON_VERSION}" ) diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index e84c6845156..ba89a6e3fce 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -28,12 +28,6 @@ ENDIF() SET(_sdl2_SEARCH_DIRS ${SDL2_ROOT_DIR} - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(SDL2_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index a520a45e370..0d66b4785e2 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_sndfile_SEARCH_DIRS ${LIBSNDFILE_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 593ed54a08e..353b05f90b5 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_spacenav_SEARCH_DIRS ${SPACENAV_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(SPACENAV_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindTBB.cmake b/build_files/cmake/Modules/FindTBB.cmake index c44e03b207d..de7db09ddb5 100644 --- a/build_files/cmake/Modules/FindTBB.cmake +++ b/build_files/cmake/Modules/FindTBB.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_tbb_SEARCH_DIRS ${TBB_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts /opt/lib/tbb ) diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake index 3ebcbb178c6..f14843c657e 100644 --- a/build_files/cmake/Modules/FindUSD.cmake +++ b/build_files/cmake/Modules/FindUSD.cmake @@ -27,9 +27,7 @@ ENDIF() SET(_usd_SEARCH_DIRS ${USD_ROOT_DIR} - /usr/local /opt/lib/usd - /opt/usd ) FIND_PATH(USD_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index e69a14c9306..c16ab4468cc 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -29,9 +29,6 @@ ENDIF() SET(_xml2_SEARCH_DIRS ${XML2_ROOT_DIR} - /usr/local - /sw # Fink - /opt/local # DarwinPorts ) FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h -- cgit v1.2.3