X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;f=src%2Flibs%2FCommon%2FCMakeLists.txt;h=ce5f10cda42580644eb007deaf79a305272b55ac;hb=36bd93cf4263b118366b3db2d26e8efb1ac1b690;hp=bb87e9f8cfe9b827f9a39a36d083b4d6bbafbc49;hpb=6230ebd0a05134031e52001c15473c3c3e6c7c1b;p=evaf
diff --git a/src/libs/Common/CMakeLists.txt b/src/libs/Common/CMakeLists.txt
index bb87e9f..ce5f10c 100644
--- a/src/libs/Common/CMakeLists.txt
+++ b/src/libs/Common/CMakeLists.txt
@@ -1,10 +1,6 @@
# Name of the target
set(TARGET CommonLib)
-# Qt modules
-set(QT_DONT_USE_QTGUI TRUE)
-include(${QT_USE_FILE})
-
# Needed for exporting/importing symbols
add_definitions(-DCOMMON_LIBRARY)
@@ -24,6 +20,8 @@ set(SRCS
registry.cpp
util.cpp
inifile.cpp
+ config.cpp
+ prop.cpp
)
# Header files for the meta-object compiler
@@ -32,21 +30,27 @@ set(MOC_HDRS
ieventqueue.h
ilogger.h
iregistry.h
+ iconfig.h
+ iprop.h
app.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)