From 9cfcbc86e998b2ab22a6955cd0df2adf073d0137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 23 Mar 2012 12:40:49 +0000 Subject: [PATCH] Fixed Help install directories for the qt help git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14282 383ad7c9-94d9-4d36-a494-682f7c89f535 --- CoreApp/CMakeLists.txt | 2 +- Documentation/DeveloperQtHelpTarget/CMakeLists.txt | 2 +- Documentation/UserQtHelpTarget/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt index 31e64305..bc6e6e6c 100644 --- a/CoreApp/CMakeLists.txt +++ b/CoreApp/CMakeLists.txt @@ -304,7 +304,7 @@ if (NOT APPLE) acg_install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Icons" "${ACG_PROJECT_DATADIR}/Icons") acg_install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Licenses" "${ACG_PROJECT_DATADIR}/Licenses") acg_install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Fonts" "${ACG_PROJECT_DATADIR}/Fonts") - acg_install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Help" "${ACG_PROJECT_DATADIR}/Help") + #acg_install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Doc" "${ACG_PROJECT_DATADIR}/Doc") Disabled as we don't want html docs inside of the binaries if ( WIN32 ) # create qt config file and install it diff --git a/Documentation/DeveloperQtHelpTarget/CMakeLists.txt b/Documentation/DeveloperQtHelpTarget/CMakeLists.txt index bda17c69..df3bbd8d 100644 --- a/Documentation/DeveloperQtHelpTarget/CMakeLists.txt +++ b/Documentation/DeveloperQtHelpTarget/CMakeLists.txt @@ -24,6 +24,6 @@ IF (DOXYGEN_FOUND) add_custom_command(TARGET doc-DeveloperQtHelp POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory ${developer_html_doc_dir}) # install the DeveloperQtHelp on install - install(DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Help" DESTINATION "${ACG_PROJECT_DATADIR}/Doc" ) + install(DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Help" DESTINATION "${ACG_PROJECT_DATADIR}/Help" ) ENDIF(DOXYGEN_FOUND) diff --git a/Documentation/UserQtHelpTarget/CMakeLists.txt b/Documentation/UserQtHelpTarget/CMakeLists.txt index c0c48574..48a0d17b 100644 --- a/Documentation/UserQtHelpTarget/CMakeLists.txt +++ b/Documentation/UserQtHelpTarget/CMakeLists.txt @@ -24,6 +24,6 @@ IF (DOXYGEN_FOUND) # install the UserHelp on install # This will also install the plugin User Documentations - install(DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Help" DESTINATION "${ACG_PROJECT_DATADIR}/Doc" ) + install(DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Help" DESTINATION "${ACG_PROJECT_DATADIR}/Help" ) ENDIF(DOXYGEN_FOUND) -- GitLab