diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-02-05 17:16:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-05 17:23:22 +0300 |
| commit | 87c18fbbc532fd7e92eeec209a3ff559757548eb (patch) | |
| tree | eaf062994010915d5419fd1c29b578d27c138927 /build_files/build_environment | |
| parent | db0121a0099836113e7babe7f006e99e4f6ed69f (diff) | |
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'.
Diffstat (limited to 'build_files/build_environment')
6 files changed, 0 insertions, 16 deletions
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 ) |