diff options
| author |  Fabio Bas | 2023-09-20 22:08:55 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | 0d1754ed0c44e4feaf9d4c7adb648264e56081b4 (patch) | |
| tree | 59b1533ba9460bde3ac2c617e9b1d5567030b1d0 /src | |
| parent | Rename COMPILE_WEBKIT_SUPPORT to COMPILE_WEBENGINE_SUPPORT (diff) | |
| download | KVIrc-0d1754ed0c44e4feaf9d4c7adb648264e56081b4.tar.gz KVIrc-0d1754ed0c44e4feaf9d4c7adb648264e56081b4.tar.bz2 KVIrc-0d1754ed0c44e4feaf9d4c7adb648264e56081b4.zip | |
cmake: add support for qt6
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index aa3d1c8d3..34af6b5e4 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -128,17 +128,12 @@ if(MINGW) endif() add_library(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) -target_link_libraries(${KVILIB_BINARYNAME} ${LIBS}) +target_link_libraries(${KVILIB_BINARYNAME} ${LIBS} ${qt_kvirc_modules}) # Enable C++17 set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD 17) set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON) - -if(Qt5Widgets_FOUND) - target_link_libraries(${KVILIB_BINARYNAME} ${qt5_kvirc_modules}) -endif() - set_target_properties(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") if(WANT_STRIP) diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 97c441e88..eceb91af1 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -268,16 +268,12 @@ else() add_executable(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS}) endif() -target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) +target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS} ${qt_kvirc_modules}) # Enable C++17 set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD 17) set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON) -if(Qt5Widgets_FOUND) - target_link_libraries(${KVIRC_BINARYNAME} ${qt5_kvirc_modules}) -endif() - if(MINGW) # For some reason CMake doesn't do this itself... # In case of MSVC, it does add /implib:kvirc.lib though |