Blob Blame Raw
From bbf2886f4a5cccabe0444c8d20a890ebb7c489d2 Mon Sep 17 00:00:00 2001
From: Bart Janssens <bart@bartjanssens.org>
Date: Tue, 27 Sep 2016 19:45:50 +0200
Subject: [PATCH 02/16] COMP: Properly disable doc building

Issue #25
---
 CMakeLists.txt       | 4 ++--
 share/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c570d999..a989c8ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(K3DCompiler) # Detect problematic compilers
 SET(K3D_MAJOR_VERSION 0)
 SET(K3D_MINOR_VERSION 8)
 SET(K3D_RELEASE_VERSION 0)
-SET(K3D_BUILD_VERSION 4)
+SET(K3D_BUILD_VERSION 7)
 SET(K3D_SO_VERSION 1)
 
 SET(K3D_PACKAGE k3d)
@@ -229,7 +229,7 @@ OPTION(K3D_BUILD_XTRACKCAD_MODULE "Build the XTrackCAD Model Railroad integratio
 OPTION(K3D_BUILD_YAFRAY_MODULE "Build the YAFRAY render engine integration module" ON)
 
 OPTION(K3D_BUILD_DOCS "Build the documentation" OFF)
-OPTION(K3D_BUILD_GUIDE "Build the html guide" ON)
+OPTION(K3D_BUILD_GUIDE "Build the html guide" OFF)
 
 OPTION(K3D_ENABLE_OSX_BUNDLE "Package K-3D as an OSX bundle (ignored on other platforms)." OFF)
 OPTION(K3D_ENABLE_DISTRIBUTION "Enable distribution targets." OFF)
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 9420dff6..cccaad21 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -12,4 +12,4 @@ FUNCTION(K3D_ADD_SHARE_FILES PATTERN TARGET)
 ENDFUNCTION()
 
 K3D_ADD_SUBDIRECTORY(man REQUIRES K3D_BUILD_DOCS)
-K3D_ADD_SUBDIRECTORY(k3d REQUIRES K3D_BUILD_DOCS)
+ADD_SUBDIRECTORY(k3d)
-- 
2.20.1