diff --git a/DeployMacros.cmake b/DeployMacros.cmake index 850a5fb..afc68e3 100644 --- a/DeployMacros.cmake +++ b/DeployMacros.cmake @@ -587,7 +587,7 @@ macro(deploy_target _T) set(_LIBS_FILES) set(_VERB) set(_WVERB 1> NUL) - set(_OPTIONS) + set(_OPTIONS "--strip;${CMAKE_STRIP}") set(_ZIP_DMG 1) set(_DEB_OPT 1) set(_DEB_SERVICE 0) diff --git a/README.md b/README.md index 871c98f..84e51e6 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,10 @@ This repo contains useful CMake utilites: * FindMinGW - find MinGW compiler locations -* DeployMacros - macros for deploy applications on Windows/Debian/MacOS * TargetArch - detect target machine architecture +* DeployMacros - macros for deploy applications on Windows/Debian/MacOS * SHSTKMacros - macros to install libraries and applications +* SHSTKQtMacros - macros to install Qt libraries and applications, generating typical projects ## Install Only "install" target exists. diff --git a/cmake_android.sh b/cmake_android.sh index 9b7e609..99ed4b1 100644 --- a/cmake_android.sh +++ b/cmake_android.sh @@ -1,3 +1,4 @@ +#! /bin/bash export SDK_DIR=/usr/lib/android-sdk export PREFIX=/soft/android -rm -rf * && cmake -DCMAKE_TOOLCHAIN_FILE=${SDK_DIR}/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-21 -DQt4=0 -DQt5=1 -DQt5_DIR=${PREFIX}/qt/lib/cmake/Qt5 ../libs +cmake -DCMAKE_TOOLCHAIN_FILE=${SDK_DIR}/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-21 -DQt4=0 -DQt5=1 -DQt5_DIR=${PREFIX}/qt/lib/cmake/Qt5 $@