[Kde-games-devel] KDE/kdegames

[Stefan Majewsky]

SVN commit 1149809 by majewsky:

After successful review, integrate palapeli-goldberg-slicer from kdereview into KDE/kdegames/palapeli.

CCMAIL: kde-core-devel at kde.org
CCMAIL: kde-games-devel at kde.org


 A             doc/palapeli/palapeli-goldberg-slicer (directory)  
 D             doc/palapeli/palapeli-goldberg-slicer/CMakeLists.txt  
 A             doc/palapeli/palapeli-goldberg-slicer/README  
 M  +37 -0     palapeli/slicers/CMakeLists.txt  
 A             palapeli/slicers/goldberg (directory)  
 A             palapeli/slicers/goldberg/README   trunk/kdereview/palapeli-goldberg-slicer/README#1148782
 A             palapeli/slicers/goldberg/TODO   trunk/kdereview/palapeli-goldberg-slicer/TODO#1148782
 A             palapeli/slicers/goldberg/goldberg-engine.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/goldberg-engine.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/goldberg-engine.h   trunk/kdereview/palapeli-goldberg-slicer/src/goldberg-engine.h#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid-cairo.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/grid-cairo.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid-cairo.svg   trunk/kdereview/palapeli-goldberg-slicer/grid-cairo.svg#1148782
 A             palapeli/slicers/goldberg/grid-hex.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/grid-hex.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid-hex.svg   trunk/kdereview/palapeli-goldberg-slicer/grid-hex.svg#1148782
 A             palapeli/slicers/goldberg/grid-rect.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/grid-rect.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid-rotrex.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/grid-rotrex.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid-rotrex.svg   trunk/kdereview/palapeli-goldberg-slicer/grid-rotrex.svg#1148782
 A             palapeli/slicers/goldberg/grid-voronoi.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/grid-voronoi.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/grid.h   trunk/kdereview/palapeli-goldberg-slicer/src/grid.h#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/pointfinder.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/pointfinder.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/pointfinder.h   trunk/kdereview/palapeli-goldberg-slicer/src/pointfinder.h#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/slicer-goldberg.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/slicer-goldberg.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/slicer-goldberg.h   trunk/kdereview/palapeli-goldberg-slicer/src/slicer-goldberg.h#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/utilities.cpp   trunk/kdereview/palapeli-goldberg-slicer/src/utilities.cpp#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/goldberg/utilities.h   trunk/kdereview/palapeli-goldberg-slicer/src/utilities.h#1148782 [License: GPL (v2+)]
 A             palapeli/slicers/palapeli_goldbergslicer.desktop   trunk/kdereview/palapeli-goldberg-slicer/palapeli_goldbergslicer.desktop#1148782


--- trunk/KDE/kdegames/palapeli/slicers/CMakeLists.txt #1149808:1149809
@@ -1,3 +1,22 @@
+### locate qvoronoi executable (only to print a nice warning if it's not there)
+
+find_program(QVORONOI_EXECUTABLE NAMES qvoronoi
+	# search in $ENV{PATH} only (to match the behavior of the program)
+	NO_CMAKE_PATH
+	NO_CMAKE_ENVIRONMENT_PATH
+	NO_CMAKE_SYSTEM_PATH
+	#NO_SYSTEM_ENVIRONMENT_PATH <- not this one, because we want $ENV{PATH} (see CMake manual for details)
+)
+if(QVORONOI_EXECUTABLE)
+	set(QVORONOI_FOUND TRUE)
+else(QVORONOI_EXECUTABLE)
+	set(QVORONOI_FOUND FALSE)
+endif(QVORONOI_EXECUTABLE)
+
+macro_log_feature(QVORONOI_FOUND "qvoronoi" "Part of the qhull package, needed for the irregular grid from the Palapeli Slicer Collection" "http://www.qhull.org/download" FALSE "" "")
+
+
+
 #correctly include the headers of libpala when they are not yet installed
 set_directory_properties(PROPERTIES COMPILE_DEFINITIONS USE_LOCAL_LIBPALA)
 set(SLICER_LINK_LIBS ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} pala)
@@ -8,11 +27,29 @@
 kde4_add_plugin(palapeli_jigsawslicer slicer-jigsaw.cpp)
 target_link_libraries(palapeli_jigsawslicer ${SLICER_LINK_LIBS})
 
+set(palapeli_goldbergslicer_SRCS
+	goldberg/slicer-goldberg.cpp
+	goldberg/goldberg-engine.cpp
+	goldberg/grid-cairo.cpp
+	goldberg/grid-hex.cpp
+	goldberg/grid-rect.cpp
+	goldberg/grid-rotrex.cpp
+	goldberg/grid-voronoi.cpp
+	goldberg/pointfinder.cpp
+	goldberg/utilities.cpp
+)
+
+kde4_add_plugin(palapeli_goldbergslicer ${palapeli_goldbergslicer_SRCS})
+target_link_libraries(palapeli_goldbergslicer ${SLICER_LINK_LIBS})
+
+
 install(TARGETS
+	palapeli_goldbergslicer
 	palapeli_rectslicer
 	palapeli_jigsawslicer
 DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES
+	palapeli_goldbergslicer.desktop
 	palapeli_rectslicer.desktop
 	palapeli_jigsawslicer.desktop
 DESTINATION ${SERVICES_INSTALL_DIR})