diff CMakeLists.txt @ 13:e26f9cc93601

Also add Wall to GUI components. Link with crypto32 on windows
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 19 Feb 2014 10:44:09 +0000
parents 7e2f14c7aba2
children f4f957c58e0a
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Feb 14 11:30:55 2014 +0000
+++ b/CMakeLists.txt	Wed Feb 19 10:44:09 2014 +0000
@@ -34,10 +34,10 @@
 )
 
 # Warn level to be used for privileged parts
-set(WARN_HARDENING_FLAGS " -Wall -Wextra -Wconversion -Wformat-security")
+set(WARN_HARDENING_FLAGS " -Wextra -Wconversion -Wformat-security")
 
 # Hardening flags
-set(HARDENING_FLAGS " -Werror -fstack-protector-all")
+set(HARDENING_FLAGS " -Wall -Werror -fstack-protector-all")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} -Wstack-protector")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} --param ssp-buffer-size=4")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} -D_FORTIFY_SOURCE=2 -O2")
@@ -71,7 +71,7 @@
         -lglu32 -lopengl32 -lgdi32 -ljpeg -lpng -lQt5Core -lole32 -luuid -lws2_32
         -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16)
 
-   set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp)
+   set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp -lcrypt32)
 
    set(HARDENING_FLAGS " ${HARDENING_FLAGS} -Wl,--dynamicbase -Wl,--nxcompat")
 endif()

http://wald.intevation.org/projects/trustbridge/