Differentiate x86 and x64 targets for USVFS.

ModOrganizer2 · Jul 4, 2024 · 3b9420f · 3b9420f
1 parent 1d22033
commit 3b9420f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/usvfs_dll/CMakeLists.txt b/src/usvfs_dll/CMakeLists.txt
@@ -47,8 +47,9 @@ set_target_properties(usvfs_dll
     RUNTIME_OUTPUT_DIRECTORY_DEBUG ${USVFS_LIBDIR}
     RUNTIME_OUTPUT_DIRECTORY_RELEASE ${USVFS_LIBDIR})
 
-install(TARGETS usvfs_dll EXPORT usvfsTargets FILE_SET HEADERS)
-install(EXPORT usvfsTargets
-    FILE usvfsTargets.cmake
+install(TARGETS usvfs_dll EXPORT usvfs${ARCH_POSTFIX}Targets FILE_SET HEADERS)
+install(EXPORT usvfs${ARCH_POSTFIX}Targets
+    FILE usvfs${ARCH_POSTFIX}Targets.cmake
+    NAMESPACE usvfs${ARCH_POSTFIX}::
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/usvfs
 )
diff --git a/src/usvfs_proxy/CMakeLists.txt b/src/usvfs_proxy/CMakeLists.txt
@@ -12,4 +12,4 @@ set_target_properties(usvfs_proxy
     RUNTIME_OUTPUT_DIRECTORY_RELEASE ${USVFS_BINDIR}
 )
 
-install(TARGETS usvfs_proxy)
+install(TARGETS usvfs_proxy EXPORT usvfs${ARCH_POSTFIX}Targets)