Blame 0017-Compile-and-link-on-Mac.patch
|
Rex Dieter |
29094f2 |
From f76e8e065f8a8228086e25f709953267cefd2914 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
29094f2 |
From: Christoph Schleifenbaum <christoph@kdab.net>
|
|
Rex Dieter |
29094f2 |
Date: Thu, 5 Nov 2009 11:35:50 +0000
|
|
Rex Dieter |
29094f2 |
Subject: [PATCH 17/33] Compile and link on Mac
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
svn path=/trunk/kdesupport/automoc/; revision=1045135
|
|
Rex Dieter |
29094f2 |
---
|
|
Rex Dieter |
29094f2 |
CMakeLists.txt | 5 +++--
|
|
Rex Dieter |
29094f2 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
Rex Dieter |
29094f2 |
index 04e5fa7..43e225a 100644
|
|
Rex Dieter |
29094f2 |
--- a/CMakeLists.txt
|
|
Rex Dieter |
29094f2 |
+++ b/CMakeLists.txt
|
|
Rex Dieter |
29094f2 |
@@ -4,7 +4,8 @@ cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
include(CTest)
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
-find_package(Qt4 REQUIRED)
|
|
Rex Dieter |
29094f2 |
+find_package(Qt4 REQUIRED COMPONENTS QtCore )
|
|
Rex Dieter |
29094f2 |
+include(${QT_USE_FILE})
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
|
|
Rex Dieter |
29094f2 |
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
|
|
Rex Dieter |
29094f2 |
@@ -26,7 +27,7 @@ add_executable(automoc4 kde4automoc.cpp)
|
|
Rex Dieter |
29094f2 |
set_target_properties(automoc4 PROPERTIES SKIP_BUILD_RPATH FALSE
|
|
Rex Dieter |
29094f2 |
INSTALL_RPATH_USE_LINK_PATH TRUE )
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
-target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY})
|
|
Rex Dieter |
29094f2 |
+target_link_libraries(automoc4 ${QT_LIBRARIES})
|
|
Rex Dieter |
29094f2 |
|
|
Rex Dieter |
29094f2 |
install(TARGETS automoc4 DESTINATION bin)
|
|
Rex Dieter |
29094f2 |
install(FILES Automoc4Config.cmake Automoc4Version.cmake automoc4.files.in DESTINATION lib${LIB_SUFFIX}/automoc4)
|
|
Rex Dieter |
29094f2 |
--
|
|
Rex Dieter |
29094f2 |
2.4.3
|
|
Rex Dieter |
29094f2 |
|