Merge branch 'master' of ssh://vaikene.net/var/gitpub/evaf

[evaf] / src / main / GUI / CMakeLists.txt

diff --git a/src/main/GUI/CMakeLists.txt b/src/main/GUI/CMakeLists.txt
index c9ba20e0b2dcf1dd33e8ebd1dc973a15c3743ee5..367e2f53a1c61cb24b865900a735220b9126d261 100644 (file)
--- a/src/main/GUI/CMakeLists.txt
+++ b/src/main/GUI/CMakeLists.txt
@@ -9,7 +9,7 @@ include(${QT_USE_FILE})
 include_directories(${eVaf_INCLUDE})
 
 # Required eVaf libraries
-set(eVaf_LIBRARIES CommonLib)
+set(eVaf_LIBRARIES CommonLib PluginsLib)
 
 # Source files
 set(SRCS
@@ -33,14 +33,14 @@ set(MOC_HDRS
 )
 
 # Resources
-set(RCCS
-    gui.qrc
-)
+#set(RCCS
+#    gui.qrc
+#)
 
 # Version info resource file for Windows builds
-if(WIN32)
+if(WIN32 AND NOT MINGW)
     set(SRCS ${SRCS} version.rc gui.rc)
-endif(WIN32)
+endif(WIN32 AND NOT MINGW)
 
 qt4_add_resources(RCC_SRCS ${RCCS})