From 227a92f8a28865fe674b2602c0e46e032b916015 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 4 Feb 2024 19:52:16 -0700 Subject: [PATCH] build: get rid of "bin" subdirectory --- CMakeLists.txt | 8 ++++---- bspinfo/CMakeLists.txt | 2 +- bsputil/CMakeLists.txt | 2 +- light/CMakeLists.txt | 16 ++++++++-------- lightpreview/CMakeLists.txt | 10 +++++----- maputil/CMakeLists.txt | 2 +- qbsp/CMakeLists.txt | 2 +- vis/CMakeLists.txt | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd58f466..1032d1fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,13 +68,13 @@ if(MINGW) find_file(LIB_WINPTHREAD_1_DLL NAMES "libwinpthread-1.dll") if(LIB_GCC_S_SEH_1_DLL) - install(FILES ${LIB_GCC_S_SEH_1_DLL} DESTINATION bin) + install(FILES ${LIB_GCC_S_SEH_1_DLL} DESTINATION .) endif() if(LIB_STDCPP_6_DLL) - install(FILES ${LIB_STDCPP_6_DLL} DESTINATION bin) + install(FILES ${LIB_STDCPP_6_DLL} DESTINATION .) endif() if(LIB_WINPTHREAD_1_DLL) - install(FILES ${LIB_WINPTHREAD_1_DLL} DESTINATION bin) + install(FILES ${LIB_WINPTHREAD_1_DLL} DESTINATION .) endif() endif() @@ -202,7 +202,7 @@ if(NOT DISABLE_DOCS) add_subdirectory(docs) endif () -install(FILES README.md DESTINATION bin) +install(FILES README.md DESTINATION .) #CPack configuration diff --git a/bspinfo/CMakeLists.txt b/bspinfo/CMakeLists.txt index 8ba6d7dc..c87320c9 100644 --- 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 bin) +install(TARGETS bspinfo RUNTIME DESTINATION .) diff --git a/bsputil/CMakeLists.txt b/bsputil/CMakeLists.txt index 5bd5b54b..b4be5acd 100644 --- 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 bin) +install(TARGETS bsputil RUNTIME DESTINATION .) diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt index 79fc1833..6e2e829a 100644 --- a/light/CMakeLists.txt +++ b/light/CMakeLists.txt @@ -92,7 +92,7 @@ if (embree_FOUND) endif() if(NOT SKIP_EMBREE_INSTALL) - install(FILES $ DESTINATION bin) + install(FILES $ DESTINATION .) endif() # install TBB @@ -112,7 +112,7 @@ if (embree_FOUND) get_filename_component(TBB_SO_FILE "${TBB_SO_FILE_SYMLINK}" REALPATH) message(STATUS "TBB .so file: ${TBB_SO_FILE}") - install(FILES ${TBB_SO_FILE} DESTINATION bin RENAME "${TBB_SO_FILE_SYMLINK_NAME}") + install(FILES ${TBB_SO_FILE} DESTINATION . RENAME "${TBB_SO_FILE_SYMLINK_NAME}") # tbbmalloc get_target_property(TBBMALLOC_SO_FILE_SYMLINK TBB::tbbmalloc IMPORTED_LOCATION_RELEASE) @@ -125,20 +125,20 @@ if (embree_FOUND) message(STATUS "TBBMALLOC .so file: ${TBBMALLOC_SO_FILE}") - install(FILES ${TBBMALLOC_SO_FILE} DESTINATION bin RENAME "${TBBMALLOC_SO_FILE_SYMLINK_NAME}") + install(FILES ${TBBMALLOC_SO_FILE} DESTINATION . RENAME "${TBBMALLOC_SO_FILE_SYMLINK_NAME}") else() # preferred method - install(FILES $ DESTINATION bin) - install(FILES $ DESTINATION bin) + install(FILES $ DESTINATION .) + install(FILES $ DESTINATION .) endif() if((NOT SKIP_EMBREE_INSTALL) AND (NOT EMBREE_LICENSE STREQUAL EMBREE_LICENSE-NOTFOUND)) - install(FILES ${EMBREE_LICENSE} DESTINATION bin RENAME LICENSE-embree.txt) + install(FILES ${EMBREE_LICENSE} DESTINATION . RENAME LICENSE-embree.txt) endif() endif(embree_FOUND) copy_mingw_dlls(light) add_loader_path_to_rpath(light) -install(TARGETS light RUNTIME DESTINATION bin) -install(FILES ../gpl_v3.txt DESTINATION bin) +install(TARGETS light RUNTIME DESTINATION .) +install(FILES ../gpl_v3.txt DESTINATION .) diff --git a/lightpreview/CMakeLists.txt b/lightpreview/CMakeLists.txt index fe46a81b..c90b080e 100644 --- a/lightpreview/CMakeLists.txt +++ b/lightpreview/CMakeLists.txt @@ -68,10 +68,10 @@ add_loader_path_to_rpath(lightpreview) # Install Qt DLL's if (WIN32) - install(FILES $ DESTINATION bin) - install(FILES $ DESTINATION bin) - install(FILES $ DESTINATION bin) - install(FILES "$" DESTINATION bin/platforms) + install(FILES $ DESTINATION .) + install(FILES $ DESTINATION .) + install(FILES $ DESTINATION .) + install(FILES "$" DESTINATION platforms) endif () function(apple_install_lib SRC_TARGET_NAME DEST_PATH) @@ -109,4 +109,4 @@ if (APPLE) apple_install_lib(Qt5::DBus "$/QtDBus.framework/Versions/5") endif () -install(TARGETS lightpreview RUNTIME DESTINATION bin BUNDLE DESTINATION bin) +install(TARGETS lightpreview RUNTIME DESTINATION . BUNDLE DESTINATION .) diff --git a/maputil/CMakeLists.txt b/maputil/CMakeLists.txt index abd7d5b6..e92af350 100644 --- 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 bin) +install(TARGETS maputil RUNTIME DESTINATION .) diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt index 6d19fe48..ee52b6eb 100644 --- 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 bin) +install(TARGETS qbsp RUNTIME DESTINATION .) # HACK: copy .dll dependencies add_custom_command(TARGET qbsp POST_BUILD diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt index 7c03e2d4..3a51e09b 100644 --- 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 bin) +install(TARGETS vis RUNTIME DESTINATION .)