diff options
Diffstat (limited to 'src/modules')
79 files changed, 390 insertions, 390 deletions
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index edd464261..57468051d 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists.txt for src/modules/ -IF(APPLE) - SET(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup") -ENDIF() +if(APPLE) + set(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup") +endif() -INCLUDE_DIRECTORIES( +include_directories( ../kvilib/tal/ ../kvilib/config/ ../kvilib/core/ @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ../kvirc/ui/ ) -SUBDIRS( +subdirs( about action actioneditor addon aliaseditor avatar chan channelsjoin classeditor codetester config context dcc dialog @@ -44,15 +44,15 @@ SUBDIRS( window ) -IF(COMPILE_PERL_SUPPORT) - SUBDIRS(perl) -ENDIF() +if(COMPILE_PERL_SUPPORT) + subdirs(perl) +endif() -IF(COMPILE_PYTHON_SUPPORT) - SUBDIRS(python) -ENDIF() +if(COMPILE_PYTHON_SUPPORT) + subdirs(python) +endif() -IF(APPLE) +if(APPLE) # This is a dirty trick ensure we get some code executed after the last module gets installed - SUBDIRS(zzz_afterlastmodule) -ENDIF() + subdirs(zzz_afterlastmodule) +endif() diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt index f13e3c4a2..415e4ac2c 100644 --- a/src/modules/about/CMakeLists.txt +++ b/src/modules/about/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/about -SET(kviabout_SRCS +set(kviabout_SRCS AboutDialog.cpp libkviabout.cpp ) -SET(kvi_module_name kviabout) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviabout) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt index cdade3beb..a41ca7d52 100644 --- a/src/modules/action/CMakeLists.txt +++ b/src/modules/action/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/action -SET(kviaction_SRCS +set(kviaction_SRCS libkviaction.cpp ) -SET(kvi_module_name kviaction) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviaction) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt index 01219de21..a0b930750 100644 --- a/src/modules/actioneditor/CMakeLists.txt +++ b/src/modules/actioneditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/actioneditor -SET(kviactioneditor_SRCS +set(kviactioneditor_SRCS ActionEditor.cpp libkviactioneditor.cpp ) -SET(kvi_module_name kviactioneditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviactioneditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt index b260a6cbf..cc2588915 100644 --- a/src/modules/addon/CMakeLists.txt +++ b/src/modules/addon/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/addon -SET( +set( kviaddon_SRCS libkviaddon.cpp AddonManagementDialog.cpp @@ -9,5 +9,5 @@ SET( WebAddonInterfaceDialog.cpp ) -SET(kvi_module_name kviaddon) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviaddon) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt index 25c3831e6..5583ccef5 100644 --- a/src/modules/aliaseditor/CMakeLists.txt +++ b/src/modules/aliaseditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/aliaseditor -SET(kvialiaseditor_SRCS +set(kvialiaseditor_SRCS libkvialiaseditor.cpp AliasEditorWindow.cpp ) -SET(kvi_module_name kvialiaseditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvialiaseditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt index 28f0435ab..ce8f7b3c1 100644 --- a/src/modules/avatar/CMakeLists.txt +++ b/src/modules/avatar/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/avatar -SET(kviavatar_SRCS +set(kviavatar_SRCS libkviavatar.cpp ) -SET(kvi_module_name kviavatar) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviavatar) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt index 3160ded82..9919bbd56 100644 --- a/src/modules/chan/CMakeLists.txt +++ b/src/modules/chan/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/chan -SET(kvichan_SRCS +set(kvichan_SRCS libkvichan.cpp ) -SET(kvi_module_name kvichan) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvichan) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt index 6b3db6f09..b04a4131a 100644 --- a/src/modules/channelsjoin/CMakeLists.txt +++ b/src/modules/channelsjoin/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/channelsjoin -SET(kvichannelsjoin_SRCS +set(kvichannelsjoin_SRCS libkvichannelsjoin.cpp ChannelsJoinDialog.cpp ) -SET(kvi_module_name kvichannelsjoin) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvichannelsjoin) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/classeditor/CMakeLists.txt b/src/modules/classeditor/CMakeLists.txt index 7c4fa0874..b7d408c5d 100644 --- a/src/modules/classeditor/CMakeLists.txt +++ b/src/modules/classeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/classeditor -SET(kviclasseditor_SRCS +set(kviclasseditor_SRCS libkviclasseditor.cpp ClassEditorWindow.cpp ) -SET(kvi_module_name kviclasseditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviclasseditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt index 084aeaff0..390e4e1c9 100644 --- a/src/modules/codetester/CMakeLists.txt +++ b/src/modules/codetester/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/codetester -SET(kvicodetester_SRCS +set(kvicodetester_SRCS libkvicodetester.cpp CodeTesterWindow.cpp ) -SET(kvi_module_name kvicodetester) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvicodetester) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt index 71a9dc81f..0d233bcbf 100644 --- a/src/modules/config/CMakeLists.txt +++ b/src/modules/config/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/config -SET(kviconfig_SRCS +set(kviconfig_SRCS libkviconfig.cpp ) -SET(kvi_module_name kviconfig) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviconfig) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt index cb06787e5..666bf9484 100644 --- a/src/modules/context/CMakeLists.txt +++ b/src/modules/context/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/context -SET(kvicontext_SRCS +set(kvicontext_SRCS libkvicontext.cpp ) -SET(kvi_module_name kvicontext) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvicontext) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index af776967f..84abb0ccd 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/dcc -SET(kvidcc_SRCS +set(kvidcc_SRCS DccVoiceAdpcmCodec.cpp DccBroker.cpp DccCanvasWindow.cpp @@ -20,31 +20,31 @@ SET(kvidcc_SRCS DccWindow.cpp ) -IF(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) - LIST(APPEND kvidcc_SRCS +if(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) + list(APPEND kvidcc_SRCS DccVideoWindow.cpp ) -ENDIF() +endif() -SET(files +set(files kvi_dccfiletransfericons.png ) -IF(WIN32) - LIST(APPEND LIBS -lws2_32) -ENDIF() +if(WIN32) + list(APPEND LIBS -lws2_32) +endif() -SET(kvi_module_name kvidcc) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvidcc) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt index c898505af..b61dbd3b4 100644 --- a/src/modules/dialog/CMakeLists.txt +++ b/src/modules/dialog/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/dialog -SET(kvidialog_SRCS +set(kvidialog_SRCS libkvidialog.cpp ) -SET(kvi_module_name kvidialog) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvidialog) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt index f73b96971..d98cb2012 100644 --- a/src/modules/editor/CMakeLists.txt +++ b/src/modules/editor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/editor -SET(kvieditor_SRCS +set(kvieditor_SRCS libkvieditor.cpp ScriptEditorImplementation.cpp ) -SET(kvi_module_name kvieditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvieditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt index 5269ac1ea..c3e6c9769 100644 --- a/src/modules/eventeditor/CMakeLists.txt +++ b/src/modules/eventeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/eventeditor -SET(kvieventeditor_SRCS +set(kvieventeditor_SRCS EventEditorWindow.cpp libkvieventeditor.cpp ) -SET(kvi_module_name kvieventeditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvieventeditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt index a22a40d94..04312044a 100644 --- a/src/modules/file/CMakeLists.txt +++ b/src/modules/file/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/file -SET(kvifile_SRCS +set(kvifile_SRCS libkvifile.cpp ) -SET(kvi_module_name kvifile) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifile) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt index 05aeced60..f0c6cb291 100644 --- a/src/modules/filetransferwindow/CMakeLists.txt +++ b/src/modules/filetransferwindow/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/filetransferwindow -SET(kvifiletransferwindow_SRCS +set(kvifiletransferwindow_SRCS libkvifiletransferwindow.cpp FileTransferWindow.cpp ) -SET(kvi_module_name kvifiletransferwindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifiletransferwindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/fish/CMakeLists.txt b/src/modules/fish/CMakeLists.txt index 427c689ef..de2b1706f 100644 --- a/src/modules/fish/CMakeLists.txt +++ b/src/modules/fish/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/fish -SET(kvifish_SRCS +set(kvifish_SRCS libkvifish.cpp ) -SET(kvi_module_name kvifish) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifish) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt index 30f1202b8..7dda3610d 100644 --- a/src/modules/help/CMakeLists.txt +++ b/src/modules/help/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/help -SET(kvihelp_SRCS +set(kvihelp_SRCS libkvihelp.cpp HelpWidget.cpp HelpWindow.cpp HelpIndex.cpp ) -SET(kvi_module_name kvihelp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvihelp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt index f421cbfee..4b82b0895 100644 --- a/src/modules/http/CMakeLists.txt +++ b/src/modules/http/CMakeLists.txt @@ -1,24 +1,24 @@ # CMakeLists for src/modules/http -SET(kvihttp_SRCS +set(kvihttp_SRCS libkvihttp.cpp HttpFileTransfer.cpp ) -SET(files +set(files kvi_httpicons.png ) -SET(kvi_module_name kvihttp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvihttp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt index fad51aa2a..228d9a842 100644 --- a/src/modules/ident/CMakeLists.txt +++ b/src/modules/ident/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/ident -SET(kviident_SRCS +set(kviident_SRCS libkviident.cpp ) -IF(WIN32) - SET(LIBS ${LIBS} -lws2_32) -ENDIF(WIN32) +if(WIN32) + set(LIBS ${LIBS} -lws2_32) +endif(WIN32) -SET(kvi_module_name kviident) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviident) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt index 29b1ab051..cfee75ddb 100644 --- a/src/modules/iograph/CMakeLists.txt +++ b/src/modules/iograph/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/iograph -SET(kviiograph_SRCS +set(kviiograph_SRCS libkviiograph.cpp ) -SET(kvi_module_name kviiograph) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviiograph) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt index d5a840002..8ecac997d 100644 --- a/src/modules/lamerizer/CMakeLists.txt +++ b/src/modules/lamerizer/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/lamerizer -SUBDIRS(caps) +subdirs(caps) -SET(kvilamerizer_SRCS +set(kvilamerizer_SRCS libkvilamerizer.cpp ) -SET(kvi_module_name kvilamerizer) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilamerizer) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/lamerizer/caps/CMakeLists.txt b/src/modules/lamerizer/caps/CMakeLists.txt index e526ccf9d..0d6b2ef69 100644 --- a/src/modules/lamerizer/caps/CMakeLists.txt +++ b/src/modules/lamerizer/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE lamerizer) +set(CAPSFILE lamerizer) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/language/CMakeLists.txt b/src/modules/language/CMakeLists.txt index d8f3848bf..8ebee5d2e 100644 --- a/src/modules/language/CMakeLists.txt +++ b/src/modules/language/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/language -SET(kvilanguage_SRCS +set(kvilanguage_SRCS libkvilanguage.cpp detector.cpp ) -SET(kvi_module_name kvilanguage) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilanguage) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt index 23ec60243..667ef3753 100644 --- a/src/modules/links/CMakeLists.txt +++ b/src/modules/links/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/links -SET(kvilinks_SRCS +set(kvilinks_SRCS libkvilinks.cpp LinksWindow.cpp ) -SET(kvi_module_name kvilinks) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilinks) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt index 71d9eb8cf..fd594e47c 100644 --- a/src/modules/list/CMakeLists.txt +++ b/src/modules/list/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/list -SET(kvilist_SRCS +set(kvilist_SRCS libkvilist.cpp ListWindow.cpp ) -SET(kvi_module_name kvilist) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilist) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt index caa508dbf..d67fb202f 100644 --- a/src/modules/log/CMakeLists.txt +++ b/src/modules/log/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/log -SET(kvilog_SRCS +set(kvilog_SRCS libkvilog.cpp ) -SET(kvi_module_name kvilog) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilog) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt index d47227b32..4d838cd67 100644 --- a/src/modules/logview/CMakeLists.txt +++ b/src/modules/logview/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/logview -SET(kvilogview_SRCS +set(kvilogview_SRCS libkvilogview.cpp LogFile.cpp LogViewWidget.cpp LogViewWindow.cpp ) -SET(kvi_module_name kvilogview) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilogview) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt index 7c8fbd327..8e43673d8 100644 --- a/src/modules/mask/CMakeLists.txt +++ b/src/modules/mask/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/mask -SET(kvimask_SRCS +set(kvimask_SRCS libkvimask.cpp ) -SET(kvi_module_name kvimask) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimask) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt index 8adb2b610..a0bc08e55 100644 --- a/src/modules/math/CMakeLists.txt +++ b/src/modules/math/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/math -SET(kvimath_SRCS +set(kvimath_SRCS libkvimath.cpp ) -SET(kvi_module_name kvimath) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimath) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt index c497c0679..3c5c15854 100644 --- a/src/modules/mediaplayer/CMakeLists.txt +++ b/src/modules/mediaplayer/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/mediaplayer -SET(kvimediaplayer_SRCS +set(kvimediaplayer_SRCS libkvimediaplayer.cpp MpInterface.cpp MpMp3.cpp @@ -11,13 +11,13 @@ SET(kvimediaplayer_SRCS MpSpotifyInterface.cpp ) -SET(kvi_module_name kvimediaplayer) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimediaplayer) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(WIN32) - ADD_LIBRARY(gen_kvirc MODULE winamp.cpp) - IF(MINGW) - SET_TARGET_PROPERTIES(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) - ENDIF() - INSTALL(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) -ENDIF() +if(WIN32) + add_library(gen_kvirc MODULE winamp.cpp) + if(MINGW) + set_target_properties(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) + endif() + install(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) +endif() diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt index 9a34e3839..2da6051a6 100644 --- a/src/modules/mircimport/CMakeLists.txt +++ b/src/modules/mircimport/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/mircimport -SUBDIRS(caps pics) +subdirs(caps pics) -SET(kvimircimport_SRCS +set(kvimircimport_SRCS libkvimircimport.cpp ) -SET(kvi_module_name kvimircimport) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimircimport) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mircimport/caps/CMakeLists.txt b/src/modules/mircimport/caps/CMakeLists.txt index fc6aa669d..7db7cc5ac 100644 --- a/src/modules/mircimport/caps/CMakeLists.txt +++ b/src/modules/mircimport/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE mircimport) +set(CAPSFILE mircimport) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/serverimport/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/serverimport/) +endif() diff --git a/src/modules/mircimport/pics/CMakeLists.txt b/src/modules/mircimport/pics/CMakeLists.txt index ba59cbdf4..96ba74f54 100644 --- a/src/modules/mircimport/pics/CMakeLists.txt +++ b/src/modules/mircimport/pics/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./pics -SET(PICSFILE kvi_mircimport.png) +set(PICSFILE kvi_mircimport.png) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt index 912ec7e5a..e33ad1be0 100644 --- a/src/modules/my/CMakeLists.txt +++ b/src/modules/my/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/my -SET(kvimy_SRCS +set(kvimy_SRCS libkvimy.cpp Idle_x11.cpp Idle_mac.cpp Idle.cpp ) -SET(kvi_module_name kvimy) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimy) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt index bd4047ee5..e688ca8d7 100644 --- a/src/modules/notifier/CMakeLists.txt +++ b/src/modules/notifier/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/notifier -SET(kvinotifier_SRCS +set(kvinotifier_SRCS libkvinotifier.cpp NotifierWindow.cpp NotifierMessage.cpp @@ -8,7 +8,7 @@ SET(kvinotifier_SRCS NotifierWindowBorder.cpp ) -SET(kvi_module_name kvinotifier) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvinotifier) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -ADD_SUBDIRECTORY(pics) +add_subdirectory(pics) diff --git a/src/modules/notifier/pics/CMakeLists.txt b/src/modules/notifier/pics/CMakeLists.txt index 67a0f1bef..e72585c0f 100644 --- a/src/modules/notifier/pics/CMakeLists.txt +++ b/src/modules/notifier/pics/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for src/modules/notifier/pics -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index d2342fa96..0f324e93b 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -3,13 +3,13 @@ # From qmake #QT += xml -IF(WIN32) - LIST(APPEND LIBS -lws2_32) -ENDIF() +if(WIN32) + list(APPEND LIBS -lws2_32) +endif() -SET(kviobjects_SRCS +set(kviobjects_SRCS libkviobjects.cpp KvsObject_button.cpp KvsObject_buttonGroup.cpp @@ -62,5 +62,5 @@ SET(kviobjects_SRCS KvsObject_xmlreader.cpp ) -SET(kvi_module_name kviobjects) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviobjects) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt index b355ed6a0..2326afbc1 100644 --- a/src/modules/options/CMakeLists.txt +++ b/src/modules/options/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/options -SET(kvioptions_SRCS +set(kvioptions_SRCS libkvioptions.cpp OptionsWidgetContainer.cpp OptionsDialog.cpp @@ -46,5 +46,5 @@ SET(kvioptions_SRCS OptionsWidget_tray.cpp ) -SET(kvi_module_name kvioptions) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvioptions) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt index f4fe7762e..b41c4a9bc 100644 --- a/src/modules/perl/CMakeLists.txt +++ b/src/modules/perl/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/perl -SET(kviperl_SRCS +set(kviperl_SRCS libkviperl.cpp ) -SET(kvi_module_name kviperl) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviperl) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt index ca99a3257..593edac8a 100644 --- a/src/modules/perlcore/CMakeLists.txt +++ b/src/modules/perlcore/CMakeLists.txt @@ -1,31 +1,31 @@ # CMakeLists for src/modules/perlcore -SET(kviperlcore_SRCS +set(kviperlcore_SRCS libkviperlcore.cpp ) -SET(kvi_module_name kviperlcore) +set(kvi_module_name kviperlcore) -IF(COMPILE_PERL_SUPPORT) - EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts +if(COMPILE_PERL_SUPPORT) + execute_process(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts OUTPUT_VARIABLE PERL_COMPILE_FLAGS ) #remove new line characters - STRING(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) + string(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) #remove leading and trailing spaces (string strip) - STRING(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) -ENDIF() + string(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +endif() -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(COMPILE_PERL_SUPPORT) - IF(WANT_DEBUG AND MSVC) +if(COMPILE_PERL_SUPPORT) + if(WANT_DEBUG AND MSVC) # Activestates Perl does not support Run-Time Error checks - STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) - STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT}) - STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - ENDIF() - SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) -ENDIF()
\ No newline at end of file + string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) + string(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT}) + string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + endif() + set_target_properties(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +endif()
\ No newline at end of file diff --git a/src/modules/popup/CMakeLists.txt b/src/modules/popup/CMakeLists.txt index a334bbbae..f92f16b66 100644 --- a/src/modules/popup/CMakeLists.txt +++ b/src/modules/popup/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/popup -SET(kvipopup_SRCS +set(kvipopup_SRCS libkvipopup.cpp ) -SET(kvi_module_name kvipopup) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvipopup) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt index 9fdea80f5..5a447f1e5 100644 --- a/src/modules/popupeditor/CMakeLists.txt +++ b/src/modules/popupeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/popupeditor -SET(kvipopupeditor_SRCS +set(kvipopupeditor_SRCS libkvipopupeditor.cpp PopupEditorWindow.cpp ) -SET(kvi_module_name kvipopupeditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvipopupeditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/proxydb/CMakeLists.txt b/src/modules/proxydb/CMakeLists.txt index 64b04e5b4..5a596eea6 100644 --- a/src/modules/proxydb/CMakeLists.txt +++ b/src/modules/proxydb/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/proxydb -SET(kviproxydb_SRCS +set(kviproxydb_SRCS libkviproxydb.cpp ) -SET(kvi_module_name kviproxydb) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviproxydb) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/python/CMakeLists.txt b/src/modules/python/CMakeLists.txt index 1c70434f9..468b2ff8b 100644 --- a/src/modules/python/CMakeLists.txt +++ b/src/modules/python/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/python -SET(kvipython_SRCS +set(kvipython_SRCS libkvipython.cpp ) -SET(kvi_module_name kvipython) +set(kvi_module_name kvipython) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/pythoncore/CMakeLists.txt b/src/modules/pythoncore/CMakeLists.txt index 4e74007cb..ba49fd109 100644 --- a/src/modules/pythoncore/CMakeLists.txt +++ b/src/modules/pythoncore/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/pythoncore -SET(kvipythoncore_SRCS +set(kvipythoncore_SRCS libkvipythoncore.cpp kvircmodule.cpp ) -SET(KVI_DEFAULT_FRAME_CAPTION "") +set(KVI_DEFAULT_FRAME_CAPTION "") -SET(kvi_module_name kvipythoncore) +set(kvi_module_name kvipythoncore) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt index d366480fc..a1ea88d1b 100644 --- a/src/modules/raweditor/CMakeLists.txt +++ b/src/modules/raweditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/raweditor -SET(kviraweditor_SRCS +set(kviraweditor_SRCS libkviraweditor.cpp RawEditorWindow.cpp ) -SET(kvi_module_name kviraweditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviraweditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt index 08ddd53ba..193921d32 100644 --- a/src/modules/regchan/CMakeLists.txt +++ b/src/modules/regchan/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/regchan -SET(kviregchan_SRCS +set(kviregchan_SRCS libkviregchan.cpp ) -SET(kvi_module_name kviregchan) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviregchan) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt index 3573300c8..9197ed2eb 100644 --- a/src/modules/reguser/CMakeLists.txt +++ b/src/modules/reguser/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/reguser -SET(kvireguser_SRCS +set(kvireguser_SRCS libkvireguser.cpp RegisteredUserEntryDialog.cpp RegistrationWizard.cpp RegisteredUsersDialog.cpp ) -SET(kvi_module_name kvireguser) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvireguser) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index e2e17bd81..92b3fe56b 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/rijndael -IF(WANT_OPENSSL) - SUBDIRS(caps) +if(WANT_OPENSSL) + subdirs(caps) - SET(kvirijndael_SRCS + set(kvirijndael_SRCS libkvirijndael.cpp Rijndael.cpp BlowFish.cpp @@ -13,8 +13,8 @@ IF(WANT_OPENSSL) - # SET(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") + # set(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") - SET(kvi_module_name kvirijndael) - INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -ENDIF() + set(kvi_module_name kvirijndael) + include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +endif() diff --git a/src/modules/rijndael/caps/CMakeLists.txt b/src/modules/rijndael/caps/CMakeLists.txt index fe40c9e87..e56915489 100644 --- a/src/modules/rijndael/caps/CMakeLists.txt +++ b/src/modules/rijndael/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE rijndael) +set(CAPSFILE rijndael) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/rot13/CMakeLists.txt b/src/modules/rot13/CMakeLists.txt index cb80a5f50..730a89da9 100644 --- a/src/modules/rot13/CMakeLists.txt +++ b/src/modules/rot13/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/rot13 -SUBDIRS(caps) +subdirs(caps) -SET(kvirot13_SRCS +set(kvirot13_SRCS libkvirot13.cpp ) -SET(kvi_module_name kvirot13) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvirot13) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/rot13/caps/CMakeLists.txt b/src/modules/rot13/caps/CMakeLists.txt index 8c1efa8be..4c02ac1ca 100644 --- a/src/modules/rot13/caps/CMakeLists.txt +++ b/src/modules/rot13/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE rot13) +set(CAPSFILE rot13) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/serverdb/CMakeLists.txt b/src/modules/serverdb/CMakeLists.txt index de563343a..be1f1829f 100644 --- a/src/modules/serverdb/CMakeLists.txt +++ b/src/modules/serverdb/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/serverdb -SET(kviserverdb_SRCS +set(kviserverdb_SRCS libkviserverdb.cpp ) -SET(kvi_module_name kviserverdb) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviserverdb) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt index 7f2634662..41729eb33 100644 --- a/src/modules/setup/CMakeLists.txt +++ b/src/modules/setup/CMakeLists.txt @@ -1,15 +1,15 @@ # CMakeLists for src/modules/setup -IF(WIN32) - LIST(APPEND LIBS -lole32 -luuid) -ENDIF() +if(WIN32) + list(APPEND LIBS -lole32 -luuid) +endif() -SET(kvisetup_SRCS +set(kvisetup_SRCS libkvisetup.cpp SetupWizard.cpp ) -SET(kvi_module_name kvisetup) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisetup) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt index 64b1041f1..c4e050cd1 100644 --- a/src/modules/sharedfile/CMakeLists.txt +++ b/src/modules/sharedfile/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/sharedfile -SET(kvisharedfile_SRCS +set(kvisharedfile_SRCS libkvisharedfile.cpp ) -SET(kvi_module_name kvisharedfile) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisharedfile) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt index cbfde16c1..5589461c1 100644 --- a/src/modules/sharedfileswindow/CMakeLists.txt +++ b/src/modules/sharedfileswindow/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/sharedfileswindow -SET(kvisharedfileswindow_SRCS +set(kvisharedfileswindow_SRCS libkvisharedfileswindow.cpp SharedFilesWindow.cpp ) -SET(kvi_module_name kvisharedfileswindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisharedfileswindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt index 479332f22..ae75c3fdd 100644 --- a/src/modules/snd/CMakeLists.txt +++ b/src/modules/snd/CMakeLists.txt @@ -1,22 +1,22 @@ # CMakeLists for src/modules/snd -IF(COMPILE_PHONON_SUPPORT) - INCLUDE_DIRECTORIES(${PHONON_INCLUDE_DIR}) -ENDIF() +if(COMPILE_PHONON_SUPPORT) + include_directories(${PHONON_INCLUDE_DIR}) +endif() -IF(MINGW) - LIST(APPEND LIBS -lwinmm) -ENDIF() +if(MINGW) + list(APPEND LIBS -lwinmm) +endif() -IF(MSVC) - LIST(APPEND LIBS winmm.lib) -ENDIF() +if(MSVC) + list(APPEND LIBS winmm.lib) +endif() -SET(kvisnd_SRCS +set(kvisnd_SRCS libkvisnd.cpp ) -SET(kvi_module_name kvisnd) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisnd) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt index 94b7a7399..00e3ff954 100644 --- a/src/modules/socketspy/CMakeLists.txt +++ b/src/modules/socketspy/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/socketspy -SET(kvisocketspy_SRCS +set(kvisocketspy_SRCS libkvisocketspy.cpp SocketSpyWindow.cpp ) -SET(kvi_module_name kvisocketspy) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisocketspy) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt index 7746be3f4..1182bc9f4 100644 --- a/src/modules/spaste/CMakeLists.txt +++ b/src/modules/spaste/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/spaste -SET(kvispaste_SRCS +set(kvispaste_SRCS libkvispaste.cpp SlowPasteController.cpp ) -SET(kvi_module_name kvispaste) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvispaste) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt index 2d0781294..9e4b1bcda 100644 --- a/src/modules/str/CMakeLists.txt +++ b/src/modules/str/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/str -SET(kvistr_SRCS +set(kvistr_SRCS libkvistr.cpp ) -SET(kvi_module_name kvistr) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvistr) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt index 549d9daf8..cd5f1a1c1 100644 --- a/src/modules/system/CMakeLists.txt +++ b/src/modules/system/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/system -SET(kvisystem_SRCS +set(kvisystem_SRCS libkvisystem.cpp Plugin.cpp ) -SET(kvi_module_name kvisystem) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisystem) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt index 1e31629de..4491a08ec 100644 --- a/src/modules/term/CMakeLists.txt +++ b/src/modules/term/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for src/modules/term -SET(kviterm_SRCS +set(kviterm_SRCS libkviterm.cpp TermWidget.cpp TermWindow.cpp ) -SET(kvi_module_name kviterm) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviterm) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt index 3a5abdda6..90ed579ad 100644 --- a/src/modules/texticons/CMakeLists.txt +++ b/src/modules/texticons/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/texticons -SET(kvitexticons_SRCS +set(kvitexticons_SRCS libkvitexticons.cpp ) -SET(kvi_module_name kvitexticons) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitexticons) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt index 024d74a57..26e89aa88 100644 --- a/src/modules/theme/CMakeLists.txt +++ b/src/modules/theme/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/theme -SET(kvitheme_SRCS +set(kvitheme_SRCS libkvitheme.cpp WebThemeInterfaceDialog.cpp ThemeManagementDialog.cpp @@ -9,5 +9,5 @@ SET(kvitheme_SRCS ThemeFunctions.cpp ) -SET(kvi_module_name kvitheme) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitheme) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt index 3dc50b888..1e14e4c9a 100644 --- a/src/modules/tip/CMakeLists.txt +++ b/src/modules/tip/CMakeLists.txt @@ -1,26 +1,26 @@ # CMakeLists for src/modules/tip -SET(kvitip_SRCS +set(kvitip_SRCS libkvitip.cpp ) -FILE(GLOB tips "*.kvc") -FILE(GLOB pics "*.png") +file(GLOB tips "*.kvc") +file(GLOB pics "*.png") -SET(kvi_module_name kvitip) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitip) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) # Install rule -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt index 96ced70cb..ed14fe619 100644 --- a/src/modules/tmphighlight/CMakeLists.txt +++ b/src/modules/tmphighlight/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/tmphighlight -SET(kvitmphighlight_SRCS +set(kvitmphighlight_SRCS libkvitmphighlight.cpp ) -SET(kvi_module_name kvitmphighlight) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitmphighlight) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt index 4c4f90ed0..90d0b624d 100644 --- a/src/modules/toolbar/CMakeLists.txt +++ b/src/modules/toolbar/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/toolbar -SET(kvitoolbar_SRCS +set(kvitoolbar_SRCS libkvitoolbar.cpp ) -SET(kvi_module_name kvitoolbar) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitoolbar) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt index aa7322aa6..87d107350 100644 --- a/src/modules/toolbareditor/CMakeLists.txt +++ b/src/modules/toolbareditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/toolbareditor -SET(kvitoolbareditor_SRCS +set(kvitoolbareditor_SRCS libkvitoolbareditor.cpp CustomizeToolBarsDialog.cpp ) -SET(kvi_module_name kvitoolbareditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitoolbareditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt index 8742dfde9..636ee7c48 100644 --- a/src/modules/torrent/CMakeLists.txt +++ b/src/modules/torrent/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/torrent -SET(kvitorrent_SRCS +set(kvitorrent_SRCS libkvitorrent.cpp StatusBarApplet.cpp KTorrentDbusInterface.cpp TorrentInterface.cpp ) -SET(kvi_module_name kvitorrent) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitorrent) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt index dbec283cb..3304f479f 100644 --- a/src/modules/trayicon/CMakeLists.txt +++ b/src/modules/trayicon/CMakeLists.txt @@ -1,35 +1,35 @@ # CMakeLists for src/modules/trayicon -SET(kvitrayicon_SRCS +set(kvitrayicon_SRCS libkvitrayicon.cpp ) -SET(unixFiles +set(unixFiles kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png ) -SET(win32Files +set(win32Files kvi_dock_win32.png kvi_dock_win32-0.png kvi_dock_win32-1.png kvi_dock_win32-2.png ) -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -SET(kvi_module_name kvitrayicon) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitrayicon) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${win32Files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${win32Files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/upnp/CMakeLists.txt b/src/modules/upnp/CMakeLists.txt index e0e55713f..648f2fcdc 100644 --- a/src/modules/upnp/CMakeLists.txt +++ b/src/modules/upnp/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/upnp -SET(kviupnp_SRCS +set(kviupnp_SRCS igdcontrolpoint.cpp libkviupnp.cpp Manager.cpp @@ -13,5 +13,5 @@ SET(kviupnp_SRCS -SET(kvi_module_name kviupnp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviupnp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt index 91fdacb9c..bdd8bf47a 100644 --- a/src/modules/url/CMakeLists.txt +++ b/src/modules/url/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/url -SET(kviurl_SRCS +set(kviurl_SRCS libkviurl.cpp ) -SET(kvi_module_name kviurl) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviurl) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/userlist/CMakeLists.txt b/src/modules/userlist/CMakeLists.txt index d4f8bebde..adedaf3f5 100644 --- a/src/modules/userlist/CMakeLists.txt +++ b/src/modules/userlist/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/userlist -SET(kviuserlist_SRCS +set(kviuserlist_SRCS libkviuserlist.cpp ) -SET(kvi_module_name kviuserlist) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviuserlist) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt index e68e2627a..832c9b172 100644 --- a/src/modules/window/CMakeLists.txt +++ b/src/modules/window/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/window -SET(kviwindow_SRCS +set(kviwindow_SRCS libkviwindow.cpp UserWindow.cpp ) -SET(kvi_module_name kviwindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviwindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/zzz_afterlastmodule/CMakeLists.txt b/src/modules/zzz_afterlastmodule/CMakeLists.txt index ff885a22d..39d29c157 100644 --- a/src/modules/zzz_afterlastmodule/CMakeLists.txt +++ b/src/modules/zzz_afterlastmodule/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists.txt for src/modules/zzz_afterlastmodule -IF(APPLE) - INSTALL(CODE " +if(APPLE) + install(CODE " file(GLOB_RECURSE KVIRC_INSTALLED_MODULES \"${KVIRC_MOD_PATH}/*.so\") include(BundleUtilities) fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${KVIRC_INSTALLED_MODULES}\" \"\") " COMPONENT Runtime) -ENDIF() +endif() |