From a42c31431619e71e4da2166fdb28ac49f5ffc365 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 29 Apr 2017 23:45:55 +0200 Subject: cmake: Do not build/install folders (data,modules,plugins) They're empty, are only created on Windows and seem to be completely unused (bzr r15651) --- CMakeScripts/Install.cmake | 20 +++----------------- CMakeScripts/InstallMSYS2.cmake | 20 +++----------------- 2 files changed, 6 insertions(+), 34 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 9250f3d00..f1fda7bcc 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -34,6 +34,9 @@ if(WIN32) LGPL2.1.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY doc + DESTINATION ${CMAKE_INSTALL_PREFIX}) + # devlibs and mingw dlls # There are differences in the devlibs for 64-Bit and 32-Bit build environments. @@ -178,23 +181,6 @@ if(WIN32) DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() - # Setup application data directories, poppler files, locales, icons and themes - file(MAKE_DIRECTORY - data - doc - modules - plugins) - - install(DIRECTORY - data - doc - modules - plugins - DESTINATION ${CMAKE_INSTALL_PREFIX} - PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. - PATTERN CMakeLists.txt EXCLUDE - PATTERN *.am EXCLUDE) - # Generate a dummy file in hicolor/index.theme to avoid bug 1635207 file(GENERATE OUTPUT ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/index.theme CONTENT "[Icon Theme]\nName=hicolor\nDirectories=") diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 8d31aca46..c6690bbe9 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -27,6 +27,9 @@ if(WIN32) LGPL2.1.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(DIRECTORY doc + DESTINATION ${CMAKE_INSTALL_PREFIX}) + # mingw dlls install(FILES ${MINGW_BIN}/LIBEAY32.dll @@ -142,23 +145,6 @@ if(WIN32) DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() - # Setup application data directories, poppler files, locales, icons and themes - file(MAKE_DIRECTORY - data - doc - modules - plugins) - - install(DIRECTORY - data - doc - modules - plugins - DESTINATION ${CMAKE_INSTALL_PREFIX} - PATTERN hicolor/index.theme EXCLUDE # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV. - PATTERN CMakeLists.txt EXCLUDE - PATTERN *.am EXCLUDE) - # Install hicolor/index.theme to avoid bug 1635207 install(FILES ${MINGW_PATH}/share/icons/hicolor/index.theme -- cgit v1.2.3