summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Chereau <fabien.chereau@gmail.com>2019-04-22 11:11:37 +0200
committerFabien Chereau <fabien.chereau@gmail.com>2019-04-22 11:11:37 +0200
commit755c3e83a603ae2deb437a00234c13bba8e8250c (patch)
tree2c12ba3de756eb5e2fbfda6823c290aedeb38d0f
parentc8d0f922066e202df5e98a90deadcb40a4af37b4 (diff)
Use this release as base for old SVMT plugin buildsvmt_build
-rw-r--r--CMakeLists.txt2
-rw-r--r--doc/stellarium.pod.cmake2
-rw-r--r--src/core/StelFileMgr.hpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e79a30fb53..185374b7b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
IF(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW)
+ CMAKE_POLICY(SET CMP0050 OLD)
ENDIF()
########### Project name ###########
@@ -146,6 +147,7 @@ IF (BUILD_STATIC_PLUGINS)
IF (USE_PLUGIN_SVMT)
SET(QT_USE_QTXML TRUE) # For SVMT we also need QtXml module
SET(QT_USE_QTDECLARATIVE TRUE) # For SVMT we also need QML module, this line doesn't seem to work right now
+ SET(QT_USE_QTWEBKIT TRUE)
ENDIF()
IF (USE_PLUGIN_VIRGO)
diff --git a/doc/stellarium.pod.cmake b/doc/stellarium.pod.cmake
index e60c0b498e..f438dc2794 100644
--- a/doc/stellarium.pod.cmake
+++ b/doc/stellarium.pod.cmake
@@ -179,7 +179,7 @@ of this page.
=head1 AUTHOR
-Fabien Chéreau, Rob Spearman, Johan Meuris, Matthew Gates,
+Fabien Chereau, Rob Spearman, Johan Meuris, Matthew Gates,
Johannes Gajdosik, Nigel Kerr, Andras Mohari.
x14817
diff --git a/src/core/StelFileMgr.hpp b/src/core/StelFileMgr.hpp
index b4fba39399..6b2b0da6d7 100644
--- a/src/core/StelFileMgr.hpp
+++ b/src/core/StelFileMgr.hpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef _STELFILEMGR_HPP
+#ifndef _STELFILEMGR_HPP_
#define _STELFILEMGR_HPP_
#define CHECK_FILE "data/ssystem.ini"