Revert appveyor addition and DeployQt cmake

kneitinger · Sep 19, 2018 · a64d2ec · a64d2ec
1 parent f1a13a1
commit a64d2ec
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 185 deletions.
diff --git a/COPYING b/COPYING
@@ -235,7 +235,3 @@ License: LGPL-2.1
 Files: share/macosx/dmg-background.tiff
 Copyright: 2008-2014, Andrey Tarantsov
 License: MIT
-
-Files: cmake/DeployQt.cmake
-Copyright: 2018, Nathan Osman
-License: MIT
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/ci/appveyor/before-build.sh b/ci/appveyor/before-build.sh
diff --git a/ci/appveyor/build.sh b/ci/appveyor/build.sh
diff --git a/ci/appveyor/install.sh b/ci/appveyor/install.sh
diff --git a/ci/appveyor/test.sh b/ci/appveyor/test.sh
diff --git a/cmake/DeployQt.cmake b/cmake/DeployQt.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -328,8 +328,11 @@ if(APPLE AND WITH_APP_BUNDLE)
   set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
   include(CPack)
 
-  include(DeployQt)
-  macdeployqt(${PROGNAME})
+  add_custom_command(TARGET ${PROGNAME}
+                     POST_BUILD
+                     COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
+                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
+                     COMMENT "Deploying app bundle")
 endif()
 
 install(TARGETS ${PROGNAME}
@@ -390,8 +393,8 @@ if(MINGW)
   set(gp_tool \"objdump\")
   " COMPONENT Runtime)
 
-  include(DeployQt)
-  windeployqt(${PROGNAME})
+  include(DeployQt4)
+  install_qt4_executable(${PROGNAME}.exe)
 
   # install Qt5 plugins
   set(PLUGINS_DIR ${Qt5_PREFIX}/share/qt5/plugins)

diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
@@ -11,11 +11,10 @@ set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework
 target_link_libraries(keepassx-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets)
 
 if(WITH_APP_BUNDLE)
-  include(DeployQt)
   add_custom_command(TARGET keepassx-autotype-cocoa
                      POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
-                     COMMAND ${MACDEPLOYQT_EXECUTABLE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
+                     COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
   COMMENT "Deploying autotype plugin")
 else()