Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/osgearth/files: osgearth-2.5-cmake-options.patch osgearth-2.4-FindMiniZip.cmake.patch
Date: Fri, 22 Nov 2013 13:37:03
Message-Id: 20131122133655.6446A2004E@flycatcher.gentoo.org
1 hasufell 13/11/22 13:36:55
2
3 Added: osgearth-2.5-cmake-options.patch
4 Removed: osgearth-2.4-FindMiniZip.cmake.patch
5 Log:
6 version bump, remove old
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
9
10 Revision Changes Path
11 1.1 sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch?rev=1.1&content-type=text/plain
15
16 Index: osgearth-2.5-cmake-options.patch
17 ===================================================================
18 commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3
19 Author: hasufell <hasufell@g.o>
20 Date: Fri Nov 22 14:06:34 2013 +0100
21
22 add cmake options
23
24 diff --git a/CMakeLists.txt b/CMakeLists.txt
25 index 34cd375..dbb4cb4 100755
26 --- a/CMakeLists.txt
27 +++ b/CMakeLists.txt
28 @@ -115,10 +115,20 @@ FIND_PACKAGE(Sqlite3)
29 FIND_PACKAGE(ZLIB)
30
31 SET(V8_DIR "" CACHE PATH "set to base V8 install path")
32 -FIND_PACKAGE(V8)
33 -
34 -FIND_PACKAGE(JavaScriptCore)
35 -FIND_PACKAGE(LibNoise)
36 +OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON)
37 +IF(OSGEARTH_USE_V8)
38 + FIND_PACKAGE(V8)
39 +ENDIF(OSGEARTH_USE_V8)
40 +
41 +OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON)
42 +OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON)
43 +
44 +IF (OSGEARTH_USE_JAVASCRIPTCORE)
45 + FIND_PACKAGE(JavaScriptCore)
46 +ENDIF (OSGEARTH_USE_JAVASCRIPTCORE)
47 +IF (OSGEARTH_USE_LIBNOISE)
48 + FIND_PACKAGE(LibNoise)
49 +ENDIF(OSGEARTH_USE_LIBNOISE)
50
51 FIND_PACKAGE(Qt4)
52 IF (QT4_FOUND)