From 653895414dca71dde86dd78f493b5b646bb36ab7 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sat, 12 May 2012 21:25:36 +0200
Subject: rework of extra-cmake-modules

-rename the cmake package from extra-cmake-modules to ECM
-change variable names and docs accordingly
-move setting of Qt-related defines from ECMQtFrameworks.cmake to KDECompilerSettings.cmake
-remove ECMSetVersionVariables.cmake, we'll do it some other way
-rename ECMConfig.cmake.in to ECMQtFrameworkConfig.cmake.in, since this is where it is used, and it would have the same name as ECMConfig.cmake.in which is for extra-cmake-modules itself

Alex
---
 kde-modules/KDECMakeSettings.cmake    | 15 ++++++++++++---
 kde-modules/KDECompilerSettings.cmake | 11 +++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'kde-modules')

diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake
index 828a0b38..2ff8e029 100644
--- a/kde-modules/KDECMakeSettings.cmake
+++ b/kde-modules/KDECMakeSettings.cmake
@@ -1,6 +1,7 @@
-# KDE_SKIP_RPATH_SETTINGS
-# KDE_SKIP_BUILD_SETTINGS
-# KDE_SKIP_TEST_SETTINGS
+# The following variables can be set to TRUE to skip parts of the functionality:
+#  KDE_SKIP_RPATH_SETTINGS
+#  KDE_SKIP_BUILD_SETTINGS
+#  KDE_SKIP_TEST_SETTINGS
 
 
 ################# RPATH handling ##################################
@@ -80,6 +81,14 @@ if(NOT KDE_SKIP_BUILD_SETTINGS)
    # Enable automoc in cmake
    set(CMAKE_AUTOMOC ON)
 
+   # under Windows, generate all executables and libraries into
+   # one common directory, so the executables find their dlls
+   if(WIN32)
+      set(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+      set(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+      set(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+   endif()
+
 endif()
 
 ###################################################################
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
index 905e16d6..506bb2c0 100644
--- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake
@@ -473,3 +473,14 @@ endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
 add_compiler_export_flags()  # from GenerateExportHeader.cmake
 
 add_definitions(${_KDE4_PLATFORM_DEFINITIONS})
+
+# add some more Qt-related definitions:
+add_definitions(-DQT_NO_CAST_TO_ASCII
+                -DQT_NO_CAST_FROM_ASCII
+                -DQT_STRICT_ITERATORS
+                -DQT_NO_URL_CAST_FROM_STRING
+                -DQT_NO_CAST_FROM_BYTEARRAY
+                -DQT_NO_KEYWORDS
+                -DQT_USE_FAST_CONCATENATION
+                -DQT_USE_FAST_OPERATOR_PLUS
+               )
-- 
cgit v1.2.1