olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: get rid of "bin" subdirectory

This commit is contained in:
Eric Wasylishen 2024-02-04 19:52:16 -07:00
parent aa970c0d18
commit 227a92f8a2
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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

2
bspinfo/CMakeLists.txt
View File

@ -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 .)

2
bsputil/CMakeLists.txt
View File

@ -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 .)

16
light/CMakeLists.txt
View File

@ -92,7 +92,7 @@ if (embree_FOUND)
endif()
if(NOT SKIP_EMBREE_INSTALL)
install(FILES $<TARGET_FILE:embree> DESTINATION bin)
install(FILES $<TARGET_FILE:embree> 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 $<TARGET_FILE:TBB::tbb> DESTINATION bin)
install(FILES $<TARGET_FILE:TBB::tbbmalloc> DESTINATION bin)
install(FILES $<TARGET_FILE:TBB::tbb> DESTINATION .)
install(FILES $<TARGET_FILE:TBB::tbbmalloc> 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 .)

10
lightpreview/CMakeLists.txt
View File

@ -68,10 +68,10 @@ add_loader_path_to_rpath(lightpreview)
# Install Qt DLL's
if (WIN32)
install(FILES $<TARGET_FILE:Qt5::Widgets> DESTINATION bin)
install(FILES $<TARGET_FILE:Qt5::Gui> DESTINATION bin)
install(FILES $<TARGET_FILE:Qt5::Core> DESTINATION bin)
install(FILES "$<TARGET_FILE:Qt5::QWindowsIntegrationPlugin>" DESTINATION bin/platforms)
install(FILES $<TARGET_FILE:Qt5::Widgets> DESTINATION .)
install(FILES $<TARGET_FILE:Qt5::Gui> DESTINATION .)
install(FILES $<TARGET_FILE:Qt5::Core> DESTINATION .)
install(FILES "$<TARGET_FILE:Qt5::QWindowsIntegrationPlugin>" DESTINATION platforms)
endif ()
function(apple_install_lib SRC_TARGET_NAME DEST_PATH)
@ -109,4 +109,4 @@ if (APPLE)
apple_install_lib(Qt5::DBus "$<TARGET_FILE_DIR:lightpreview>/QtDBus.framework/Versions/5")
endif ()
install(TARGETS lightpreview RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
install(TARGETS lightpreview RUNTIME DESTINATION . BUNDLE DESTINATION .)

2
maputil/CMakeLists.txt
View File

@ -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 .)

2
qbsp/CMakeLists.txt
View File

@ -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

2
vis/CMakeLists.txt
View File

@ -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 .)