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

List:       kde-commits
Subject:    [rocs] /: Do not disable default graph file plugin by build switch.
From:       Andreas Cord-Landwehr <cola () uni-paderborn ! de>
Date:       2012-09-30 19:03:31
Message-ID: 20120930190331.4EF05A60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 12b79de7fc38bf82fd01b7a09fbdd4a102cdf319 by Andreas Cord-Landweh=
r.
Committed on 30/09/2012 at 18:15.
Pushed by cordlandwehr into branch 'master'.

Do not disable default graph file plugin by build switch.

M  +0    -3    App/CMakeLists.txt
M  +12   -0    CMakeLists.txt
M  +2    -13   RocsCore/CMakeLists.txt
M  +4    -1    RocsCore/LoadSave/CMakeLists.txt

http://commits.kde.org/rocs/12b79de7fc38bf82fd01b7a09fbdd4a102cdf319

diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt
index 7a4318d..216dac4 100644
--- a/App/CMakeLists.txt
+++ b/App/CMakeLists.txt
@@ -26,9 +26,6 @@ set(ROCS_VERSION_PATCH 70)
 =

 configure_file( "${rocs_SOURCE_DIR}/rocsversion.h.cmake" "${rocs_BINARY_DI=
R}/rocsversion.h" @ONLY )
 =

-#Sice building some load/save plugins can take a long time, you can disabl=
e it.
-option(ROCS_BUILD_LOADSAVE "ROCS_BUILD_LOADSAVE" ON)
-
 include_directories(
     ${KDE4_INCLUDES}
     ${QT_INCLUDES}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59fd7c5..9c2d0fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,18 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 =

+
+
+# Allow disabling building of optional graph file backands
+option(ROCS_BUILD_LOADSAVE "ROCS_BUILD_LOADSAVE" ON)
+macro_log_feature(
+    ROCS_BUILD_LOADSAVE
+    "Graph File Plugins"
+    "Building of extra graph file plugins is disabled."
+    "edu.kde.org/rocs"
+    FALSE
+    )
+
 # feature log
 macro_log_feature(Boost_FOUND "Boost C++ Libraries" "Required to build Roc=
s" "http://www.boost.org" TRUE "1.43" "")
 if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/RocsCore/CMakeLists.txt b/RocsCore/CMakeLists.txt
index 33250a9..f4f875a 100644
--- a/RocsCore/CMakeLists.txt
+++ b/RocsCore/CMakeLists.txt
@@ -18,7 +18,6 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 =

-
 # Prepare library.
 set( rocs_core_SRCS
     DataType.cpp
@@ -87,17 +86,7 @@ install( FILES
 )
 =

 add_subdirectory(DataStructures)
-
-#### Build Load/Save plugins.
-if (ROCS_BUILD_LOADSAVE)
-    add_subdirectory( LoadSave )
-else (ROCS_BUILD_LOADSAVE)
-    message("-------------------------------------------------------------=
----")
-    message("                          ATTENTION                          =
    ")
-    message("     The build and install of Load/Save plugins are DISABLED =
    ")
-    message("    To reactivate it, set the option ROCS_BUILD_LOADSAVE to o=
n   ")
-    message("-------------------------------------------------------------=
----")
-endif(ROCS_BUILD_LOADSAVE)
+add_subdirectory(LoadSave)
 =

 install( FILES
     RocsDataStructurePlugin.desktop
@@ -109,5 +98,5 @@ install( FILES
 # Build Tests if KDE_TEST is on
 if(KDE4_BUILD_TESTS)
     enable_testing()
-    add_subdirectory( Tests )
+    add_subdirectory(Tests)
 endif(KDE4_BUILD_TESTS)
diff --git a/RocsCore/LoadSave/CMakeLists.txt b/RocsCore/LoadSave/CMakeList=
s.txt
index 3c44b27..6fcb760 100644
--- a/RocsCore/LoadSave/CMakeLists.txt
+++ b/RocsCore/LoadSave/CMakeLists.txt
@@ -15,5 +15,8 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
+#### Build Load/Save plugins.
+if (ROCS_BUILD_LOADSAVE)
+    add_subdirectory(Plugins)
+endif(ROCS_BUILD_LOADSAVE)
 =

-add_subdirectory(Plugins)

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