[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesrc-build] /
From:       Michael Pyne <mpyne () kde ! org>
Date:       2011-01-23 5:25:56
Message-ID: 20110123052556.04CE5A6092 () git ! kde ! org
[Download RAW message or body]

Git commit 7ffe80dfb0b9377727f168c0b4dd7b9a50821d39 by Michael Pyne
Pushed by mpyne into branch master

Add CMake build support for kdesrc-build.

To avoid kdesrc-build build errors, it's probably easiest just to
have a shell CMakeLists.txt which CMake can process and do nothing
with.

At some point it will be used to make the docs build, but right
now the docs install to the wrong directory (as if the name of
the project was "doc" instead of kdesrc-build), so installation
is disabled.

A  +17   -0    CMakeLists.txt         [License: UNKNOWN]
M  +2    -3    doc/CMakeLists.txt     

http://commits.kde.org/a5d5b61a/7ffe80dfb0b9377727f168c0b4dd7b9a50821d39

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..ed40f79
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.6) # Pretty much nothing works without this
+project(kdesrc-build)
+
+find_package(KDE4 REQUIRED) # Needed for the docs
+
+include(KDE4Defaults)
+include(MacroLibrary)
+
+# CMake installs to $KDEDIR/share/doc/HTML/$lang/doc for some reason instead
+# of                $KDEDIR/share/doc/HTML/$lang/kdesrc-build.
+# Figure it out later I guess...
+#macro_optional_add_subdirectory(doc)
+
+# Null install target so CMake succeeds
+add_custom_target(install
+    COMMAND /bin/true
+    )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 785e677..b5ee994 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,4 @@
+project(kdesrc-build) # Yes, just redo it, it's makes everything install right
+
 ########### install files ###############
 kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-
-install( PROGRAMS kdesrc-build.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
-

[prev in list] [next in list] [prev in thread] [next in thread]