update install rules to install cmake into lib

cmake/ThrustInstallRules.cmake

@@ -6,10 +6,15 @@ install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust"
   FILES_MATCHING
     PATTERN "*.h"
     PATTERN "*.inl"
-    PATTERN "*.cmake"
     PATTERN "*.md"
 )
 
+install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust"
+  TYPE LIB
+  FILES_MATCHING
+    PATTERN "*.cmake"
+)
+
 # Depending on how Thrust is configured, CUB's CMake scripts may or may not be
 # included, so maintain a set of CUB install rules in both projects. By default
 # CUB headers are installed alongside Thrust -- this may be disabled by turning
@@ -20,6 +25,11 @@ if (THRUST_INSTALL_CUB_HEADERS)
     TYPE INCLUDE
     FILES_MATCHING
       PATTERN "*.cuh"
+  )
+
+  install(DIRECTORY "${Thrust_SOURCE_DIR}/dependencies/cub/cub"
+    TYPE LIB
+    FILES_MATCHING
       PATTERN "*.cmake"
   )
 endif()

thrust/cmake/thrust-config-version.cmake

@@ -1,5 +1,5 @@
 # Parse version information from version.h:
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../version.h" THRUST_VERSION_HEADER)
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../../../include/thrust/version.h" THRUST_VERSION_HEADER)
 string(REGEX MATCH "#define[ \t]+THRUST_VERSION[ \t]+([0-9]+)" DUMMY "${THRUST_VERSION_HEADER}")
 set(THRUST_VERSION_FLAT ${CMAKE_MATCH_1})
 # Note that Thrust calls this the PATCH number, CMake calls it the TWEAK number:

thrust/cmake/thrust-config.cmake

@@ -625,7 +625,7 @@ set(_THRUST_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "Location of th
 if (NOT TARGET Thrust::Thrust)
   _thrust_declare_interface_alias(Thrust::Thrust _Thrust_Thrust)
   # Strip out the 'thrust/cmake/' from '[thrust_include_path]/thrust/cmake/':
-  get_filename_component(_THRUST_INCLUDE_DIR "../.." ABSOLUTE BASE_DIR "${_THRUST_CMAKE_DIR}")
+  get_filename_component(_THRUST_INCLUDE_DIR "../../../include" ABSOLUTE BASE_DIR "${_THRUST_CMAKE_DIR}")
   set(_THRUST_INCLUDE_DIR "${_THRUST_INCLUDE_DIR}"
     CACHE INTERNAL "Location of thrust headers."
   )