[Bf-blender-cvs] [4bc212c1156] tmp_libupdate_34: Cleanup: revert earlier changes which are no longer needed

[Brecht Van Lommel]

Commit: 4bc212c115627dba604e71167a7269c2dad75563
Author: Brecht Van Lommel
Date:   Wed Aug 17 16:28:27 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB4bc212c115627dba604e71167a7269c2dad75563

Cleanup: revert earlier changes which are no longer needed

===================================================================

M	build_files/cmake/Modules/FindOpenSubdiv.cmake
M	build_files/cmake/Modules/FindOpenVDB.cmake
M	build_files/cmake/Modules/FindTBB.cmake
M	build_files/cmake/Modules/FindUSD.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake
index 76daeccef1c..37a2cddf3de 100644
--- a/build_files/cmake/Modules/FindOpenSubdiv.cmake
+++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake
@@ -69,7 +69,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSubdiv DEFAULT_MSG
     _opensubdiv_LIBRARIES OPENSUBDIV_INCLUDE_DIR)
 
 IF(OPENSUBDIV_FOUND)
-  get_filename_component(OPENSUBDIV_LIBRARY_DIR ${OPENSUBDIV_OSDCPU_LIBRARY} DIRECTORY)
   SET(OPENSUBDIV_LIBRARIES ${_opensubdiv_LIBRARIES})
   SET(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
 
@@ -91,7 +90,6 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   OPENSUBDIV_INCLUDE_DIR
-  OPENSUBDIV_LIBRARY_DIR
 )
 FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake
index 60f5316824f..ed5c3778596 100644
--- a/build_files/cmake/Modules/FindOpenVDB.cmake
+++ b/build_files/cmake/Modules/FindOpenVDB.cmake
@@ -49,14 +49,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVDB DEFAULT_MSG
     OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR)
 
 IF(OPENVDB_FOUND)
-  GET_FILENAME_COMPONENT(OPENVDB_LIBRARY_DIR ${OPENVDB_LIBRARY} DIRECTORY)
   SET(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY})
   SET(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR})
 ENDIF()
 
 MARK_AS_ADVANCED(
   OPENVDB_INCLUDE_DIR
-  OPENVDB_LIBRARY_DIR
   OPENVDB_LIBRARY
 )
 
diff --git a/build_files/cmake/Modules/FindTBB.cmake b/build_files/cmake/Modules/FindTBB.cmake
index 3b0fe0900e9..ad7a1a218f8 100644
--- a/build_files/cmake/Modules/FindTBB.cmake
+++ b/build_files/cmake/Modules/FindTBB.cmake
@@ -49,7 +49,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG
     TBB_LIBRARY TBB_INCLUDE_DIR)
 
 IF(TBB_FOUND)
-  GET_FILENAME_COMPONENT(TBB_LIBRARY_DIR ${TBB_LIBRARY} DIRECTORY)
   SET(TBB_LIBRARIES ${TBB_LIBRARY})
   SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
 ELSE()
@@ -58,6 +57,5 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   TBB_INCLUDE_DIR
-  TBB_LIBRARY_DIR
   TBB_LIBRARY
 )
diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake
index 52d33f2b6ab..0fd5f06bb35 100644
--- a/build_files/cmake/Modules/FindUSD.cmake
+++ b/build_files/cmake/Modules/FindUSD.cmake
@@ -55,7 +55,7 @@ ELSE()
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(USD DEFAULT_MSG USD_LIBRARY USD_INCLUDE_DIR)
 
   IF(USD_FOUND)
-    GET_FILENAME_COMPONENT(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY)
+    get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY)
     SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR})
     set(USD_LIBRARIES ${USD_LIBRARY})
   ENDIF()