Browse Source

Use GNUInstallDirs to install dlls to the 'bin' folder (#1290)

Bas Zalmstra 11 months ago
parent
commit
25d3eafac6
1 changed files with 7 additions and 3 deletions
  1. 7 3
      Build/CMakeLists.txt

+ 7 - 3
Build/CMakeLists.txt

@@ -282,14 +282,18 @@ endif()
 
 # Install Jolt library and includes
 if (ENABLE_INSTALL)
+	include(GNUInstallDirs)
 	install(TARGETS Jolt
 		EXPORT JoltExport
-		DESTINATION lib)
+		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 	foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES})
 		string(REPLACE ${PHYSICS_REPO_ROOT} "" RELATIVE_SRC_FILE ${SRC_FILE})
 		get_filename_component(DESTINATION_PATH ${RELATIVE_SRC_FILE} DIRECTORY)
 		if (NOT RELATIVE_SRC_FILE MATCHES "\.cpp")
-			install(FILES ${SRC_FILE} DESTINATION include/${DESTINATION_PATH})
+			install(FILES ${SRC_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${DESTINATION_PATH})
 		endif()
 	endforeach()
 
@@ -298,7 +302,7 @@ if (ENABLE_INSTALL)
 		NAMESPACE Jolt::
 		FILE JoltConfig.cmake)
 	install(EXPORT JoltExport
-		DESTINATION lib/cmake/Jolt/
+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Jolt/
 		NAMESPACE Jolt::
 		FILE JoltConfig.cmake)
 endif()