Add GNUInstallDirs and BINDIR/DOCDIR updates

ericwa · Feb 14, 2025 · 397801f · 397801f
1 parent 2d54b34
commit 397801f
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,66 @@ CMakeSettings.json
 sphinx-venv
 **/__pycache__
 *-env
+3rdparty/CMakeFiles
+3rdparty/cmake_install.cmake
+3rdparty/Makefile
+docs/docs
+light/CMakeFiles
+light/cmake_install.cmake
+light/Makefile
+light/light
+light/lib*
+vis/CMakeFiles
+vis/cmake_install.cmake
+vis/Makefile
+vis/vis
+vis/lib*
+qbsp/Makefile
+qbsp/CMakeFiles
+qbsp/cmake_install.cmake
+qbsp/qbsp
+qbsp/lib*
+bspinfo/Makefile
+bspinfo/CMakeFiles
+bspinfo/cmake_install.cmake
+bspinfo/bspinfo
+bspinfo/lib*
+bsputil/Makefile
+bsputil/CMakeFiles
+bsputil/cmake_install.cmake
+bsputil/bsputil
+bsputil/lib*
+maputil/Makefile
+maputil/CMakeFiles
+maputil/cmake_install.cmake
+maputil/maputil
+maputil/lib*
+common/lib*
+lightpreview/Makefile
+lightpreview/CMakeFiles
+lightpreview/cmake_install.cmake
+lightpreview/lightpreview
+lightpreview/lightpreview_autogen
+lightpreview/lib*
+tests/Makefile
+tests/CMakeFiles
+tests/cmake_install.cmake
+tests/tests
+tests/lib*
+testmaps.hh
+cmake_install.cmake
+Makefile
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+CTestTestConfig.cmake
+CTestTestfile.cmake
+docs/CTestTestConfig.cmake
+docs/CTestTestfile.cmake
+docs/cmake_install.cmake
+docs/Makefile
+docs/CMakeFiles/
+docs/CMakeCache.txt
+lib/lib*
+install_manifest.txt
+_deps/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,8 @@ cmake_policy(SET CMP0028 NEW)
 
 project (ericw-tools)
 
+include(GNUInstallDirs)
+
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/3rdparty/Catch2/extras")
 
@@ -202,7 +204,7 @@ if(NOT DISABLE_DOCS)
 	add_subdirectory(docs)
 endif ()
 
-install(FILES README.md DESTINATION .)
+install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
 #CPack configuration
 

diff --git a/bspinfo/CMakeLists.txt b/bspinfo/CMakeLists.txt
@@ -9,4 +9,4 @@ add_custom_command(TARGET bspinfo POST_BUILD
 copy_mingw_dlls(bspinfo)
 add_loader_path_to_rpath(bspinfo)
 
-install(TARGETS bspinfo RUNTIME DESTINATION .)
+install(TARGETS bspinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/bsputil/CMakeLists.txt b/bsputil/CMakeLists.txt
@@ -17,4 +17,4 @@ add_custom_command(TARGET bsputil POST_BUILD
 copy_mingw_dlls(bsputil)
 add_loader_path_to_rpath(bsputil)
 
-install(TARGETS bsputil RUNTIME DESTINATION .)
+install(TARGETS bsputil RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -14,5 +14,5 @@ if (Sphinx_FOUND)
                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                       COMMENT "Generating documentation with Sphinx")
 
-    install(DIRECTORY ${SPHINX_BUILD}/ DESTINATION doc)
+    install(DIRECTORY ${SPHINX_BUILD}/ DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt
@@ -1,5 +1,5 @@
-option(SKIP_TBB_INSTALL "Skip TBB Library Installation" OFF)
-option(SKIP_EMBREE_INSTALL "Skip Embree Library Installation" OFF)
+option(SKIP_TBB_INSTALL "Skip TBB Library Installation" ON)
+option(SKIP_EMBREE_INSTALL "Skip Embree Library Installation" ON)
 
 set(LIGHT_INCLUDES
 	../include/light/entities.hh
@@ -92,7 +92,7 @@ if (embree_FOUND)
 	endif()
 
 	if(NOT SKIP_EMBREE_INSTALL)
-		install(FILES $<TARGET_FILE:embree> DESTINATION .)
+		install(FILES $<TARGET_FILE:embree> DESTINATION ${CMAKE_INSTALL_LIBDIR})
 	endif()
 
 	# install TBB
@@ -140,5 +140,5 @@ endif(embree_FOUND)
 copy_mingw_dlls(light)
 add_loader_path_to_rpath(light)
 
-install(TARGETS light RUNTIME DESTINATION .)
-install(FILES ../gpl_v3.txt DESTINATION .)
+install(TARGETS light RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ../gpl_v3.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
diff --git a/lightpreview/CMakeLists.txt b/lightpreview/CMakeLists.txt
@@ -111,4 +111,4 @@ if (APPLE)
     apple_install_lib(Qt5::DBus "$<TARGET_FILE_DIR:lightpreview>/QtDBus.framework/Versions/5")
 endif ()
 
-install(TARGETS lightpreview RUNTIME DESTINATION . BUNDLE DESTINATION .)
+install(TARGETS lightpreview RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/maputil/CMakeLists.txt b/maputil/CMakeLists.txt
@@ -30,4 +30,4 @@ add_custom_command(TARGET maputil POST_BUILD
 copy_mingw_dlls(maputil)
 add_loader_path_to_rpath(maputil)
 
-install(TARGETS maputil RUNTIME DESTINATION .)
+install(TARGETS maputil RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(libqbsp common ${CMAKE_THREAD_LIBS_INIT} TBB::tbb TBB::tbb
 add_executable(qbsp main.cc)
 target_link_libraries(qbsp libqbsp)
 
-install(TARGETS qbsp RUNTIME DESTINATION .)
+install(TARGETS qbsp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # HACK: copy .dll dependencies
 add_custom_command(TARGET qbsp POST_BUILD

diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt
@@ -29,4 +29,4 @@ add_custom_command(TARGET vis POST_BUILD
 copy_mingw_dlls(vis)
 add_loader_path_to_rpath(vis)
 
-install(TARGETS vis RUNTIME DESTINATION .)
+install(TARGETS vis RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})