Fix use of CMAKE_INSTALL_PREFIX in tokenizers-config.cmake

Looks like we need to use a new PATH_VAR instead.

Author: swolchok

CMakeLists.txt

@@ -210,7 +210,7 @@ configure_package_config_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tokenizers-config.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/tokenizers-config.cmake
   INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tokenizers
-  PATH_VARS CMAKE_INSTALL_INCLUDEDIR
+  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tokenizers-config.cmake

cmake/tokenizers-config.cmake.in

@@ -8,18 +8,19 @@
 
 include(CMakeFindDependencyMacro)
 include(GNUInstallDirs)
-# Find dependencies
-find_dependency(re2 REQUIRED)
-find_dependency(absl REQUIRED)
 # Directly include sentencepiece library
-set(SENTENCEPIECE_LIBRARY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libsentencepiece.a")
+set_and_check(TOKENIZERS_LIBDIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+set(SENTENCEPIECE_LIBRARY "${TOKENIZERS_LIBDIR}/libsentencepiece.a")
 if(NOT EXISTS "${SENTENCEPIECE_LIBRARY}")
   message(
     FATAL_ERROR
       "Could not find sentencepiece library at ${SENTENCEPIECE_LIBRARY}"
   )
 endif()
 
+find_dependency(re2 REQUIRED)
+find_dependency(absl REQUIRED)
+
 # Include the exported targets file
 include("${CMAKE_CURRENT_LIST_DIR}/tokenizers-targets.cmake")