Mercurial > trustbridge
changeset 1022:55a2ace0937d
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Wed, 03 Sep 2014 09:55:13 +0200 |
| parents | 70022fc31cdf (current diff) c6ae74ac5cf9 (diff) |
| children | 8365ca22d847 |
| files | |
| diffstat | 4 files changed, 60 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Sep 02 15:43:58 2014 +0200 +++ b/.hgtags Wed Sep 03 09:55:13 2014 +0200 @@ -11,3 +11,7 @@ 0000000000000000000000000000000000000000 0.85 c4ba93dbf680e9507290fa7058d660486cc0be2e 0.85 b4094dc552171376ac9481657ba509abfaecf1bc 0.9 +b4094dc552171376ac9481657ba509abfaecf1bc 0.9 +0000000000000000000000000000000000000000 0.9 +0000000000000000000000000000000000000000 0.9 +4f999c7821ce65f5482b44e12d18da44d6994dd8 0.9
--- a/INSTALL Tue Sep 02 15:43:58 2014 +0200 +++ b/INSTALL Wed Sep 03 09:55:13 2014 +0200 @@ -228,6 +228,10 @@ make qtbase (optional) make curl +Add CMAKE_STRIP to the toolchain file: + echo "set(CMAKE_STRIP $MXEPATH/usr/bin/i686-w64-mingw32.static-strip)" >> \ + "$MXEPATH/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake" + Workaround Qt CMake Bugs: find $MXEPATH/usr/i686-w64-mingw32.static/qt5/lib/cmake -name \*.cmake | \ xargs sed -i 's/\/\([a-z]*\)\.lib/\/lib\1\.a/g'
--- a/cinst/CMakeLists.txt Tue Sep 02 15:43:58 2014 +0200 +++ b/cinst/CMakeLists.txt Wed Sep 03 09:55:13 2014 +0200 @@ -30,6 +30,19 @@ ${WIN_EXTRA_LIBS}) install(TARGETS cinst DESTINATION bin) +if (WIN32) + add_custom_command( + TARGET cinst + POST_BUILD + COMMAND ${CMAKE_STRIP} cinst.exe + ) +else() + add_custom_command( + TARGET cinst + POST_BUILD + COMMAND strip cinst + ) +endif() # ---------------------------------------------------------------------- # Mozilla nss store specific certificate installer: @@ -48,6 +61,20 @@ ${PROFILING_LIBS}) set_target_properties(mozilla PROPERTIES COMPILE_FLAGS "-std=c99") install(TARGETS mozilla DESTINATION bin) + + if (WIN32) + add_custom_command( + TARGET mozilla + POST_BUILD + COMMAND ${CMAKE_STRIP} mozilla.exe + ) + else() + add_custom_command( + TARGET mozilla + POST_BUILD + COMMAND strip mozilla + ) + endif() else() message(STATUS "WARNING: Could not find nss. Mozilla cert installer will not be build!") endif()
--- a/ui/CMakeLists.txt Tue Sep 02 15:43:58 2014 +0200 +++ b/ui/CMakeLists.txt Wed Sep 03 09:55:13 2014 +0200 @@ -223,3 +223,28 @@ configure_file(trustbridge-tray-starter.sh trustbridge-tray-starter.sh COPYONLY) install(FILES trustbridge-tray-starter.sh DESTINATION bin) endif() + +# Strip the binaries +if (WIN32) + add_custom_command( + TARGET trustbridge + POST_BUILD + COMMAND ${CMAKE_STRIP} trustbridge.exe + ) + add_custom_command( + TARGET trustbridge-admin + POST_BUILD + COMMAND ${CMAKE_STRIP} trustbridge-admin.exe + ) +else() + add_custom_command( + TARGET trustbridge + POST_BUILD + COMMAND strip trustbridge + ) + add_custom_command( + TARGET trustbridge-admin + POST_BUILD + COMMAND ${CMAKE_STRIP} trustbridge-admin + ) +endif()