diff options
| author |  Elvio Basello | 2008-04-11 22:16:45 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-11 22:16:45 +0000 |
| commit | fc41a9e2aada0f54f8dee062a5a72ebe3f89726b (patch) | |
| tree | 5ee8eee46490d8170c30b50f2bc18ccae270cc29 | |
| parent | Quick fix for broken executable naming (diff) | |
| download | KVIrc-fc41a9e2aada0f54f8dee062a5a72ebe3f89726b.tar.gz KVIrc-fc41a9e2aada0f54f8dee062a5a72ebe3f89726b.tar.bz2 KVIrc-fc41a9e2aada0f54f8dee062a5a72ebe3f89726b.zip | |
fixed universal binaries build
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1461 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | TODO-cmake | 6 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.h | 1 | ||||
| -rw-r--r-- | src/modules/about/libkviabout.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e2bc7eb70..7c074e7a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,14 +48,16 @@ SET(LIBS) SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Generate verbose Makefiles") # Make MacOS X universal binaries -SET(COMPILE_UNIVERSAL false) IF(COMPILE_UNIVERSAL) IF(APPLE) SET(CMAKE_OSX_ARCHITECTURES ppc;i386) + SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "yes") #FIXME: This should be handled with CMAKE_OSX_SYSROOT (TOM) #SET(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.4") #SET(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4") ENDIF() +ELSE() + SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "not available") ENDIF() # Use DBus @@ -217,7 +219,7 @@ ENDIF() # Check for gettext # FindGettext.cmake - atm implemented in ./cmake/modules/ -# Use system-provided module from CMake 2.4.8 +# Use system-provided module from CMake 2.5 FIND_PACKAGE(GetText) #Unused by now @@ -312,12 +314,13 @@ CONFIGURE_FILE( MESSAGE(STATUS " ") MESSAGE(STATUS "Ok, this is the configuration I've worked out:") MESSAGE(STATUS " ") -MESSAGE(STATUS " Threading : ${CMAKE_STATUS_THREADS_SUPPORT}") -MESSAGE(STATUS " X11 support : ${CMAKE_STATUS_X11_SUPPORT}") -MESSAGE(STATUS " PCH support : ${CMAKE_STATUS_PCH_SUPPORT}") -MESSAGE(STATUS " KDE4 support : ${CMAKE_STATUS_KDE4_SUPPORT}") +MESSAGE(STATUS " Threading : ${CMAKE_STATUS_THREADS_SUPPORT}") +MESSAGE(STATUS " X11 support : ${CMAKE_STATUS_X11_SUPPORT}") +MESSAGE(STATUS " PCH support : ${CMAKE_STATUS_PCH_SUPPORT}") +MESSAGE(STATUS " KDE4 support : ${CMAKE_STATUS_KDE4_SUPPORT}") +MESSAGE(STATUS " Universal support : ${CMAKE_STATUS_UNIVERSAL_SUPPORT}") MESSAGE(STATUS " ") -MESSAGE(STATUS " Build date : ${CMAKE_KVIRC_BUILD_DATE}") +MESSAGE(STATUS " Build date : ${CMAKE_KVIRC_BUILD_DATE}") MESSAGE(STATUS " ") MESSAGE(STATUS "I'm ready to build kvirc for you: please type 'make' now...") MESSAGE(STATUS " ") diff --git a/TODO-cmake b/TODO-cmake index d37f7d499..643e460b5 100644 --- a/TODO-cmake +++ b/TODO-cmake @@ -7,13 +7,9 @@ transition autotools -> cmake. * Missing or broken rules - doc/* - header creation +- scripts/kvirc-config * Translation - create a make target for updating *.pot/*.po files - Cleanup: move the install target from cmake/modules/FileGetText to a better place - -* Code -- several #defines are undefined --- src/kvilib/config/kvi_settings.h : VERSION, BUILD_DATE, BUILD_FLAGS - diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h index f0c44f86d..95ef968a4 100644 --- a/src/modules/about/aboutdialog.h +++ b/src/modules/about/aboutdialog.h @@ -23,6 +23,7 @@ // #include <kvi_tal_tabdialog.h> + class KviAboutDialog : public KviTalTabDialog { Q_OBJECT diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp index 7b7853223..ece68888f 100644 --- a/src/modules/about/libkviabout.cpp +++ b/src/modules/about/libkviabout.cpp @@ -68,7 +68,7 @@ static bool about_kvs_command_kvirc(KviKvsModuleCommandCall *) static bool about_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m,"kvirc",about_kvs_command_kvirc) - return true; + return true; } static bool about_module_cleanup(KviModule *m) |