X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=blobdiff_plain;f=src%2Flibs%2FCommon%2FCMakeLists.txt;h=ce5f10cda42580644eb007deaf79a305272b55ac;hb=a81a943bee20df3c7eb34bafb3e3fe878facfe4e;hp=085749e6fc61155ff96d440a52ef00a6356a103b;hpb=814d12e0a340ae11fa4a22077b37316aa41716d7;p=evaf

diff --git a/src/libs/Common/CMakeLists.txt b/src/libs/Common/CMakeLists.txt
index 085749e..ce5f10c 100644
--- a/src/libs/Common/CMakeLists.txt
+++ b/src/libs/Common/CMakeLists.txt
@@ -1,9 +1,6 @@
 # Name of the target
 set(TARGET CommonLib)
 
-# Qt modules
-include(${QT_USE_FILE})
-
 # Needed for exporting/importing symbols
 add_definitions(-DCOMMON_LIBRARY)
 
@@ -16,38 +13,44 @@ set(eVaf_LIBRARIES)
 # Source files
 set(SRCS
     app.cpp
-    env.cpp
     event.cpp
     eventqueue.cpp
     globals.cpp
     logger.cpp
     registry.cpp
     util.cpp
+    inifile.cpp
+    config.cpp
+    prop.cpp
 )
 
 # Header files for the meta-object compiler
 set(MOC_HDRS
     iapp.h
-    ienv.h
     ieventqueue.h
     ilogger.h
     iregistry.h
+    iconfig.h
+    iprop.h
     app.h
-    env.h
     eventqueue.h
     logger.h
     registry.h
+    config.h
+    prop.h
 )
 
 # Version info resource file for Windows builds
-if(WIN32)
+if(WIN32 AND NOT MINGW)
     set(SRCS ${SRCS} version.rc)
-endif(WIN32)
+endif(WIN32 AND NOT MINGW)
 
-qt4_wrap_cpp(MOC_SRCS ${MOC_HDRS})
+qt5_wrap_cpp(MOC_SRCS ${MOC_HDRS})
 
 add_library(${TARGET} SHARED ${SRCS} ${MOC_SRCS})
 
-target_link_libraries(${TARGET} ${QT_LIBRARIES} ${eVaf_LIBRARIES})
+qt5_use_modules(${TARGET} Core)
+
+target_link_libraries(${TARGET} ${eVaf_LIBRARIES})
 
 install(TARGETS ${TARGET} DESTINATION bin)