From cd34d567a717795a3054c81cf1c85d9ef9ddc5ae Mon Sep 17 00:00:00 2001 From: iTrooz_ Date: Thu, 30 Jun 2022 15:11:00 +0200 Subject: [PATCH] build: Install pattern files in the right place (#564) --- cmake/build_helpers.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 7a61526e2..f4db7069c 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -70,13 +70,11 @@ macro(detectOS) set(CMAKE_INSTALL_BINDIR ".") set(CMAKE_INSTALL_LIBDIR ".") set(PLUGINS_INSTALL_LOCATION "plugins") - set(MAGIC_INSTALL_LOCATION "magic") elseif (APPLE) add_compile_definitions(OS_MACOS) set(CMAKE_INSTALL_BINDIR ".") set(CMAKE_INSTALL_LIBDIR ".") set(PLUGINS_INSTALL_LOCATION "plugins") - set(MAGIC_INSTALL_LOCATION "magic") enable_language(OBJC) enable_language(OBJCXX) elseif (UNIX AND NOT APPLE) @@ -84,7 +82,6 @@ macro(detectOS) set(CMAKE_INSTALL_BINDIR "bin") set(CMAKE_INSTALL_LIBDIR "lib") set(PLUGINS_INSTALL_LOCATION "share/imhex/plugins") - set(MAGIC_INSTALL_LOCATION "share/imhex/magic") else () message(FATAL_ERROR "Unknown / unsupported system!") endif() @@ -228,7 +225,7 @@ macro(createPackage) install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png) install(FILES "$" DESTINATION "${CMAKE_INSTALL_LIBDIR}") - downloadImHexPatternsFiles("./") + downloadImHexPatternsFiles("./share/imhex") endif() write_file(version ${PROJECT_VERSION})