Refactor Cipher related things.

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c6c1a5..1bd917c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,10 +142,10 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # Mac build stuff
 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/")
-  add_definitions(-DMAC_10_4_SDK)
+  set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6")
+  set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/")
+  add_definitions(-DMAC_10_6_SDK)
 endif(APPLE AND DEPLOY)
 
 # Simplify checks
@@ -187,6 +187,10 @@ if(WITH_QT5)
   find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
   # We need QtWidgets
   set(CLIENT_QT_MODULES ${CLIENT_QT_MODULES} Widgets)
+
+  # Setup the i18n-related variables
+  find_package(Qt5LinguistTools)
+
 else(WITH_QT5)
   # Select a Qt installation here, if you don't want to use system Qt
   if(QT)
@@ -195,10 +199,22 @@ else(WITH_QT5)
   endif(QT)
 
   # Now that we have the correct $PATH, lets find Qt!
-  find_package(Qt4 REQUIRED)
+  find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
 endif(WITH_QT5)
 
 
+# Neither Qt4 nor Qt5 consider lconvert relevant, so they don't support finding it...
+# Rather than shipping hacked buildsys files, let's just infer the path from lrelease
+if(QT_LRELEASE_EXECUTABLE)
+  get_filename_component(_lrelease_path ${QT_LRELEASE_EXECUTABLE} PATH)
+  if(WITH_QT5)
+    find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert-qt5 lconvert PATHS ${_lrelease_path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+  else(WITH_QT5)
+    find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert-qt4 lconvert PATHS ${_lrelease_path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+  endif(WITH_QT5)
+endif(QT_LRELEASE_EXECUTABLE)
+
+
 # Execinfo is needed for generating backtraces
 find_package(ExecInfo)
 if(EXECINFO_FOUND)
@@ -466,7 +482,6 @@ if(NOT WIN32)
   endif(HAVE_UMASK)
 endif(NOT WIN32)
 
-
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.