Mercurial > trustbridge
diff cinst/CMakeLists.txt @ 1224:7e720a820e1f
Merged.
author | Emanuel Schuetze <emanuel@intevation.de> |
---|---|
date | Wed, 24 Sep 2014 14:54:26 +0200 |
parents | 60927efa48cc |
children | 265583011f24 |
line wrap: on
line diff
--- a/cinst/CMakeLists.txt Wed Sep 24 14:54:09 2014 +0200 +++ b/cinst/CMakeLists.txt Wed Sep 24 14:54:26 2014 +0200 @@ -17,6 +17,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_win.c ${CMAKE_CURRENT_SOURCE_DIR}/certificate-installer.c ) +if (WIN32) + # Add asInvoker manifest to avoid windows heuristics + # that want to always run an -installer with admin rights. + set(trustbridge-certificate-installer_SOURCES + ${trustbridge-certificate-installer_SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/asInvoker.rc) +endif() + + add_executable(trustbridge-certificate-installer ${trustbridge-certificate-installer_SOURCES}) if (WIN32) @@ -62,6 +71,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/nss-installer.c ) +if (WIN32) + # Add asInvoker manifest to avoid windows heuristics + # that want to always run an -installer with admin rights. + set(trustbridge-nss-installer_SOURCES + ${trustbridge-nss-installer_SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/asInvoker.rc) +endif() + + if(WIN32 OR NSS_FOUND) include_directories(${NSS_INCLUDE_DIRS}) add_executable(trustbridge-nss-installer ${trustbridge-nss-installer_SOURCES})