summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-08 13:32:34 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-08 13:32:34 (GMT)
commit2522847856a96d18a31da248be86d224bfe04ef6 (patch)
treef543cc57fef2bc18d184072b029f4a9397333265
parent2f33671aca406a35214d5ca3577ea46645f663d5 (diff)
Remove deprecated QTONLY cmake flag
-rw-r--r--CMakeLists.txt10
-rw-r--r--INSTALL8
-rw-r--r--doc/index.docbook2
-rw-r--r--src/lib/marble/MarbleDirs.cpp2
-rw-r--r--tests/CTestNightlyScript.cmake.in2
5 files changed, 8 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bec679..361441c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,16 +120,6 @@ else()
set(MARBLE_NO_DBUS TRUE)
endif()
-if(QTONLY)
- # Forward the old QTONLY=TRUE option to the new WITH_KDE=FALSE
- # needs to be written to cache and forcefully, otherwise macro_optional_find_package's
- # option(WITH_${_name} ON) seems to operate on a shadowed variant of the variable
- set(WITH_KF5 FALSE CACHE BOOL "Search for KF5 package" FORCE)
- # And unset it quickly. Nobody shall use it anymore anywhere.
- # to detect if KDE _should_ be used (set by user): WITH_KDE but do not use it within src/lib/
- unset(QTONLY)
-endif()
-
SET(CMAKE_AUTOMOC TRUE)
# Use M_PI under Windows
diff --git a/INSTALL b/INSTALL
index 83107fc..466b71f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,19 +47,19 @@ directory called 'marble-build'.
Go into the build directory and type
- cmake -DQTONLY=ON ../marble
+ cmake -DWITH_KF5=FALSE ../marble
By default, marble is installed into /usr/local. If you want to
install it into any other directory, add
-DCMAKE_INSTALL_PREFIX=/path/to/install/into like in this example:
- cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=~/apps ../marble
+ cmake -DWITH_KF5=FALSE -DCMAKE_INSTALL_PREFIX=~/apps ../marble
If you have no write permission to the installation directory of cmake
(because you have a system installed cmake) you need to add another
parameter -DPACKAGE_ROOT_PREFIX=~/apps to the cmake command:
- cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=~/apps \
+ cmake -DWITH_KF5=FALSE -DCMAKE_INSTALL_PREFIX=~/apps \
-DPACKAGE_ROOT_PREFIX=~/apps ../marble
To modify the position of the data directory at compile time, see the notes
@@ -126,7 +126,7 @@ Use the cmake option -DMARBLE_DATA_PATH to specify the
built-in system path that Marble gathers its data from:
Example:
- cmake -DQTONLY=ON -DMARBLE_DATA_PATH /mnt1/marble/data ~/marble
+ cmake -DWITH_KF5=FALSE -DMARBLE_DATA_PATH /mnt1/marble/data ~/marble
3.2 "At Runtime"
diff --git a/doc/index.docbook b/doc/index.docbook
index df9c8ee..2cf27ed 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1457,7 +1457,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<para>
&marble; can be compiled as a &Qt; 4-only version as well as featuring &kde; 4 support.
- To compile &marble; with &Qt; 4-only support check out &marble; from &kde; Git into ~/marble and just do: <command>cmake -DQTONLY=ON ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; support check instructions on how to compile &kde; applications at <ulink url="http://techbase.kde.org/">&kde;'s TechBase</ulink>.
+ To compile &marble; with &Qt; 4-only support check out &marble; from &kde; Git into ~/marble and just do: <command>cmake -DWITH_KF5=FALSE ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; support check instructions on how to compile &kde; applications at <ulink url="http://techbase.kde.org/">&kde;'s TechBase</ulink>.
</para>
</sect1>
diff --git a/src/lib/marble/MarbleDirs.cpp b/src/lib/marble/MarbleDirs.cpp
index 76ed565..c88c57a 100644
--- a/src/lib/marble/MarbleDirs.cpp
+++ b/src/lib/marble/MarbleDirs.cpp
@@ -167,6 +167,7 @@ QString MarbleDirs::systemPath()
return QDir( QCoreApplication::applicationDirPath()
+// TODO: QTONLY definition was removed during Qt5/KF5 port, check what code should do
#if defined(QTONLY)
+ QLatin1String( "/data" )
#else
@@ -223,6 +224,7 @@ QString MarbleDirs::pluginSystemPath()
return QDir( QCoreApplication::applicationDirPath()
+// TODO: QTONLY definition was removed during Qt5/KF5 port, check what code should do
#if defined(QTONLY)
+ QLatin1String( "/plugins" )
#else
diff --git a/tests/CTestNightlyScript.cmake.in b/tests/CTestNightlyScript.cmake.in
index f68e5b2..c455038 100644
--- a/tests/CTestNightlyScript.cmake.in
+++ b/tests/CTestNightlyScript.cmake.in
@@ -6,7 +6,7 @@ set( CTEST_BINARY_DIRECTORY "@PROJECT_BINARY_DIR@" )
set ( CTEST_COMMAND "@CMAKE_CTEST_COMMAND@ -D Nightly --verbose" )
#set the command for configuring the dashboard
-set ( CTEST_CMAKE_COMMAND "@CMAKE_COMMAND@ -DQTONLY=ON" )
+set ( CTEST_CMAKE_COMMAND "@CMAKE_COMMAND@ -DWITH_KF5=FALSE" )
#wipe the binary tree before running
set ( CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE )