X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=565240139959980d8d170b8e7266db83daa1c740;hp=cf1a80beb5afae5280dfa2a688615b9a6fbba17d;hb=refs%2Fheads%2F0.2;hpb=caba68eff56fc5aa4f1056804b0bd60c795ac5fe

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1a80be..56524013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,9 @@
 # -DWANT_(CORE|QTCLIENT|MONO)=(ON|OFF)
 #                  : select binaries to build
 # -DQT=/path/to/qt : Choose a Qt4 installation to use instead of the system Qt4
-# -DSTATIC         : Enable static building of Quassel. Use with care.
-# -DSPUTDEV        : Do not use.
+# -DSTATIC=ON      : Enable static building of Quassel. Use with care.
+# -DSPUTDEV=ON     : Do not use.
+# -DDEPLOY=ON      : Mac OS X only. Use only fore redistribution Quassel Packages!!
 #
 # NOTE: You need to remove CMakeCache.txt if you plan to change any of these values!
 
@@ -13,39 +14,53 @@ project(QuasselIRC)
 # Target scopes don't work in older versions
 cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
 
-# This would suppress annoying warnings on cmake-2.6, but we can't use it 
-# with 2.4, so... DUH!
-# cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+endif(COMMAND cmake_policy)
 
-# Temporary
-if(STATICWIN)
-  set(STATIC 1)
-endif(STATICWIN)
+# Use our own (well, KDE's) version of some modules
+# In particular cmake's FindQt4 and FindOpenSSL are quite buggy
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+# Various options and variables that can be set on the command line
+option(WANT_CORE     "Build the core (server) binary"           ON)
+option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
+option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
+
+option(STATIC        "Enable static building (might not be portable)" OFF)
+option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
+option(SPUTDEV       "Do not use!" OFF)
+
+set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
 
 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)
 
 # Enable various flags on gcc
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-Wall Wall)
-if(Wall)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif(Wall)
-check_cxx_compiler_flag(-Wextra Wextra)
-if(Wextra)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-endif(Wextra)
-check_cxx_compiler_flag(-ansi ansi)
-if(ansi)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
-endif(ansi)
+if(CMAKE_COMPILER_IS_GNUCXX)
+  include(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag(-Wall HAVE_WALL)
+  if(HAVE_WALL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+  endif(HAVE_WALL)
+  check_cxx_compiler_flag(-Wextra HAVE_WEXTRA)
+  if(HAVE_WEXTRA)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+  endif(HAVE_WEXTRA)
+  check_cxx_compiler_flag(-ansi HAVE_ANSI)
+  if(HAVE_ANSI)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
+  endif(HAVE_ANSI)
+endif(CMAKE_COMPILER_IS_GNUCXX)
 
 set(QT_MIN_VERSION "4.3.0")
 
-option(WANT_CORE     "Build the core (server) binary"           ON)
-option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
-option(WANT_MONO     "Build the monolithic (all-in-one) binary" ON)
+if(APPLE AND DEPLOY)
+  set(CMAKE_OSX_ARCHITECTURES "i386;ppc")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4")
+  set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/")
+endif(APPLE AND DEPLOY)
 
 # Enable mostly b0rked stuff (new ChatView), do not enable this unless you know what you do...
 if(SPUTDEV)
@@ -54,13 +69,15 @@ endif(SPUTDEV)
 
 # Set up OpenSSL
 find_package(OpenSSL)
+if(NOT OPENSSL_FOUND)
+  add_definitions(-DQT_NO_OPENSSL)
+endif(NOT OPENSSL_FOUND)
 
 # Select a Qt installation here, if you don't want to use system Qt
-if(DEFINED QT)
+if(QT)
   # FindQt4 will look for the qmake binary in $PATH, so we just prepend the Qt dir
   set(ENV{PATH} ${QT}/bin:$ENV{PATH})
-  #SET(QT_QMAKE_EXECUTABLE ${QT}/bin/qmake CACHE FILEPATH "" FORCE)
-endif(DEFINED QT)
+endif(QT)
 
 # Now that we have the correct $PATH, lets find Qt!
 find_package(Qt4 REQUIRED)
@@ -72,7 +89,7 @@ include_directories(${QT_INCLUDES})
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.
 add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)
-target_link_libraries(genversion ${QT_LIBRARIES})
+target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES})
 
 add_custom_target(genversion_run ALL ${CMAKE_BINARY_DIR}/genversion
                   ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen)
@@ -132,7 +149,10 @@ endif(WIN32)
 # This macro sets variables for additional Qt modules.
 macro(setup_qt4_variables)
   set(QUASSEL_QT_LIBRARIES )
-  foreach(qtmod CORE ${ARGV})
+  IF(WIN32)
+    set(MAIN MAIN)
+  ENDIF(WIN32)
+  foreach(qtmod CORE ${ARGV} ${MAIN})
     set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY} ${QT_${qtmod}_LIB_DEPENDENCIES})
   endforeach(qtmod ${ARGV})
   set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
@@ -151,8 +171,8 @@ endif(WANT_CORE)
 
 if(WANT_QTCLIENT)
   setup_qt4_variables(GUI NETWORK)
-  add_executable(quasselclient ${CMAKE_SOURCE_DIR}/src/common/main.cpp
-                               ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
+  add_executable(quasselclient WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
+                                     ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
   set_target_properties(quasselclient PROPERTIES
                                       COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI")
   target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common
@@ -161,8 +181,8 @@ endif(WANT_QTCLIENT)
 
 if(WANT_MONO)
   setup_qt4_variables(GUI NETWORK SCRIPT SQL)
-  add_executable(quassel ${CMAKE_SOURCE_DIR}/src/common/main.cpp
-                         ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
+  add_executable(quassel WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
+                               ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
   set_target_properties(quassel PROPERTIES 
                                 COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_MONO")
   target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common 
@@ -177,6 +197,12 @@ if(APPLE)
   add_custom_command(TARGET quassel POST_BUILD
                      COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
                              ${CMAKE_SOURCE_DIR} "Quassel" quassel)
+  if(DEPLOY)
+    add_custom_command(TARGET quasselclient POST_BUILD
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client)
+    add_custom_command(TARGET quasselcore POST_BUILD
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core)
+  endif(DEPLOY)
 endif(APPLE)
 
 # Install rules