X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;ds=inline;f=src%2Flibs%2FCommon%2FCMakeLists.txt;h=c5083a39a4406268b96ae2fccad634fa54438a3c;hb=4c0329c5c2690bde28212c89029015a5da4c7e34;hp=83b5cd6f62f56f5c81f66f1a050f46425d50ec7d;hpb=563d9c2c35a46b11566ec8440beeb8006bc6aeb0;p=evaf
diff --git a/src/libs/Common/CMakeLists.txt b/src/libs/Common/CMakeLists.txt
index 83b5cd6..c5083a3 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)
@@ -16,39 +12,64 @@ set(eVaf_LIBRARIES)
# Source files
set(SRCS
- app.cpp
- env.cpp
- event.cpp
+ app.h
+ config.cpp
+ config.h
eventqueue.cpp
+ eventqueue.h
globals.cpp
+ globals.h
+ iapp.h
+ iconfig.h
+ ieventqueue.h
+ ilogger.h
+ inifile.h
+ iprop.h
+ iregistry.h
+ libcommon.h
+ logger.h
+ prop.cpp
+ prop.h
+ app.cpp
+ event.h
+ event.cpp
+ inifile_p.h
+ inifile.cpp
logger.cpp
registry.cpp
+ registry.h
util.cpp
+ util.h
+ version.h
)
# 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)