Mercurial > trustbridge
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1223:fd47a79125c6 | 1224:7e720a820e1f |
|---|---|
| 15 ${CMAKE_CURRENT_SOURCE_DIR}/windowsstore.c | 15 ${CMAKE_CURRENT_SOURCE_DIR}/windowsstore.c |
| 16 ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_linux.c | 16 ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_linux.c |
| 17 ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_win.c | 17 ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_win.c |
| 18 ${CMAKE_CURRENT_SOURCE_DIR}/certificate-installer.c | 18 ${CMAKE_CURRENT_SOURCE_DIR}/certificate-installer.c |
| 19 ) | 19 ) |
| 20 if (WIN32) | |
| 21 # Add asInvoker manifest to avoid windows heuristics | |
| 22 # that want to always run an -installer with admin rights. | |
| 23 set(trustbridge-certificate-installer_SOURCES | |
| 24 ${trustbridge-certificate-installer_SOURCES} | |
| 25 ${CMAKE_CURRENT_SOURCE_DIR}/asInvoker.rc) | |
| 26 endif() | |
| 27 | |
| 28 | |
| 20 add_executable(trustbridge-certificate-installer ${trustbridge-certificate-installer_SOURCES}) | 29 add_executable(trustbridge-certificate-installer ${trustbridge-certificate-installer_SOURCES}) |
| 21 | 30 |
| 22 if (WIN32) | 31 if (WIN32) |
| 23 set(WIN_EXTRA_LIBS -lcrypt32 -luserenv -lshell32) | 32 set(WIN_EXTRA_LIBS -lcrypt32 -luserenv -lshell32) |
| 24 endif(WIN32) | 33 endif(WIN32) |
| 60 set(trustbridge-nss-installer_SOURCES | 69 set(trustbridge-nss-installer_SOURCES |
| 61 ${CMAKE_CURRENT_SOURCE_DIR}/nss-secitemlist.c | 70 ${CMAKE_CURRENT_SOURCE_DIR}/nss-secitemlist.c |
| 62 ${CMAKE_CURRENT_SOURCE_DIR}/nss-installer.c | 71 ${CMAKE_CURRENT_SOURCE_DIR}/nss-installer.c |
| 63 ) | 72 ) |
| 64 | 73 |
| 74 if (WIN32) | |
| 75 # Add asInvoker manifest to avoid windows heuristics | |
| 76 # that want to always run an -installer with admin rights. | |
| 77 set(trustbridge-nss-installer_SOURCES | |
| 78 ${trustbridge-nss-installer_SOURCES} | |
| 79 ${CMAKE_CURRENT_SOURCE_DIR}/asInvoker.rc) | |
| 80 endif() | |
| 81 | |
| 82 | |
| 65 if(WIN32 OR NSS_FOUND) | 83 if(WIN32 OR NSS_FOUND) |
| 66 include_directories(${NSS_INCLUDE_DIRS}) | 84 include_directories(${NSS_INCLUDE_DIRS}) |
| 67 add_executable(trustbridge-nss-installer ${trustbridge-nss-installer_SOURCES}) | 85 add_executable(trustbridge-nss-installer ${trustbridge-nss-installer_SOURCES}) |
| 68 target_link_libraries(trustbridge-nss-installer | 86 target_link_libraries(trustbridge-nss-installer |
| 69 trustbridge_common | 87 trustbridge_common |