apply block()

Author: wgtmac

c++/orcConfig.cmake.in

@@ -33,7 +33,6 @@
 
 @PACKAGE_INIT@
 
-set(ORC_VENDOR_DEPENDENCIES "@ORC_VENDOR_DEPENDENCIES@")
 set(ORC_SYSTEM_DEPENDENCIES "@ORC_SYSTEM_DEPENDENCIES@")
 
 if(DEFINED CMAKE_MODULE_PATH)
@@ -59,30 +58,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/orcTargets.cmake")
 
 get_target_property(orc_static_configurations orc::orc IMPORTED_CONFIGURATIONS)
 
-foreach(dependency ${ORC_VENDOR_DEPENDENCIES})
-  string(REPLACE "|" ";" dependency_pair ${dependency})
-  list(LENGTH dependency_pair dependency_pair_length)
-  if(NOT dependency_pair_length EQUAL 2)
-    message(FATAL_ERROR "Invalid vendor dependency: ${dependency}")
-  endif()
-  list(GET dependency_pair 0 target_name)
-  list(GET dependency_pair 1 static_lib_name)
-
-  add_library("${target_name}" STATIC IMPORTED)
-
-  foreach(CONFIGURATION ${orc_static_configurations})
-    string(TOUPPER "${CONFIGURATION}" CONFIGURATION)
-    get_target_property(orc_static_location orc::orc LOCATION_${CONFIGURATION})
-    get_filename_component(orc_lib_dir "${orc_static_location}" DIRECTORY)
-    set_property(TARGET "${target_name}"
-                 APPEND
-                 PROPERTY IMPORTED_CONFIGURATIONS ${CONFIGURATION})
-    set_target_properties("${target_name}"
-                          PROPERTIES IMPORTED_LOCATION_${CONFIGURATION}
-                                     "${orc_lib_dir}/${static_lib_name}")
-  endforeach()
-endforeach()
-
 check_required_components(orc)
 
 foreach(BUILD_TYPE_SUFFIX

cmake_modules/FindGTestAlt.cmake

@@ -22,7 +22,7 @@
 # GTEST_LIBRARY: path to libgtest
 # GMOCK_STATIC_LIB: is set to gmock.a static library
 # GTEST_STATIC_LIB: is set to gtest.a static library
-# GTESTAlt_FOUND is set if GTEST is found
+# GTestAlt_FOUND is set if GTEST is found
 
 if (NOT "${GTEST_HOME}" STREQUAL "")
   message (STATUS "GTEST_HOME set: ${GTEST_HOME}")
@@ -52,14 +52,14 @@ find_library (GTEST_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_
   PATH_SUFFIXES "lib")
 
 if (GTEST_INCLUDE_DIR AND GMOCK_LIBRARY)
-  set (GTESTAlt_FOUND TRUE)
+  set (GTestAlt_FOUND TRUE)
   set (GTEST_HEADER_NAME gmock/gmock.h)
   set (GTEST_HEADER ${GTEST_INCLUDE_DIR}/${GTEST_HEADER_NAME})
 else ()
-  set (GTESTAlt_FOUND FALSE)
+  set (GTestAlt_FOUND FALSE)
 endif ()
 
-if (GTESTAlt_FOUND)
+if (GTestAlt_FOUND)
   message (STATUS "Found the GTest header: ${GTEST_HEADER}")
   message (STATUS "Found the GTest library: ${GTEST_LIBRARY}")
   message (STATUS "Found the GMock library: ${GMOCK_LIBRARY}")