projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make settings dialog modal, fixes BR #399
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
9ac2d30
..
da59dbd
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-162,12
+162,14
@@
if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
endif(HAVE_SSL)
endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
endif(HAVE_SSL)
endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
-if(STATIC AND WIN32)
- link_libraries(imm32 winmm) # missing by default :/
- if(HAVE_SSL)
+if(WIN32)
+ #if(STATIC)
+ link_libraries(imm32 winmm dbghelp) # missing by default :/
+ #endif(STATIC)
+ if(HAVE_SSL)
link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
-
endif(HAVE_SSL)
-endif(
STATIC AND
WIN32)
+ endif(HAVE_SSL)
+endif(WIN32)
if(WIN32)
set(RC_WIN32 ../pics/win32.rc) # for app icons on windows
if(WIN32)
set(RC_WIN32 ../pics/win32.rc) # for app icons on windows