[cantor/Applications/14.12] /: Add cmake_minimum_required(VERSION 2.8.9) at the top and fix build.

[David Faure]

Git commit 19252f57cb5576a39e1a43cd19670d97e0cd9a8d by David Faure.
Committed on 25/07/2015 at 22:12.
Pushed by dfaure into branch 'Applications/14.12'.

Add cmake_minimum_required(VERSION 2.8.9) at the top and fix build.

Somehow "kpty" doesn't work anymore, ${KDE4_KPTY_LIBS} must be used instead.

CCMAIL: kde-buildsystem at kde.org

M  +1    -0    CMakeLists.txt
M  +1    -1    src/CMakeLists.txt
M  +1    -1    src/backends/maxima/CMakeLists.txt
M  +1    -1    src/backends/sage/CMakeLists.txt
M  +1    -0    src/lib/CMakeLists.txt
M  +1    -1    src/lib/test/CMakeLists.txt

http://commits.kde.org/cantor/19252f57cb5576a39e1a43cd19670d97e0cd9a8d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f712483..8fc49d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8.9)
 project(cantor)
 
 find_package(KDE4 REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c41bd26..a415713 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ add_subdirectory(panelplugins)
 #build the config object in a separate library, shared between shell and part
 kde4_add_kcfg_files(config_SRCS settings.kcfgc)
 kde4_add_library( cantor_config  SHARED ${config_SRCS} )
-target_link_libraries( cantor_config ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} )
+target_link_libraries( cantor_config PUBLIC ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} )
 install( TARGETS cantor_config  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 set(cantor_SRCS
diff --git a/src/backends/maxima/CMakeLists.txt b/src/backends/maxima/CMakeLists.txt
index 1868beb..d5452e6 100644
--- a/src/backends/maxima/CMakeLists.txt
+++ b/src/backends/maxima/CMakeLists.txt
@@ -20,7 +20,7 @@ kde4_add_ui_files(MaximaBackend_SRCS settings.ui)
 kde4_add_plugin( cantor_maximabackend ${MaximaBackend_SRCS} )
 target_link_libraries( cantor_maximabackend ${KDE4_KDEUI_LIBS} cantorlibs ${KDE4_KIO_LIBS})
 if(NOT WIN32)
-  target_link_libraries(cantor_maximabackend kpty)
+   target_link_libraries(cantor_maximabackend ${KDE4_KPTY_LIBS})
 endif(NOT WIN32)
 
 kde4_add_unit_test( testmaxima testmaxima.cpp)
diff --git a/src/backends/sage/CMakeLists.txt b/src/backends/sage/CMakeLists.txt
index c1492d9..f96c564 100644
--- a/src/backends/sage/CMakeLists.txt
+++ b/src/backends/sage/CMakeLists.txt
@@ -16,7 +16,7 @@ install(FILES sagebackend.kcfg DESTINATION ${KCFG_INSTALL_DIR})
 kde4_add_ui_files(SageBackend_SRCS settings.ui)
 
 kde4_add_plugin( cantor_sagebackend ${SageBackend_SRCS} )
-target_link_libraries( cantor_sagebackend ${KDE4_KDEUI_LIBS} cantorlibs kpty ${KDE4_KIO_LIBS})
+target_link_libraries( cantor_sagebackend ${KDE4_KDEUI_LIBS} cantorlibs ${KDE4_KPTY_LIBS} ${KDE4_KIO_LIBS})
 
 kde4_add_unit_test( testsage testsage.cpp)
 target_link_libraries( testsage
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 3c6b84e..b13d8b8 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -58,6 +58,7 @@ configure_file (config-cantorlib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-cant
 kde4_add_library( cantorlibs  SHARED ${cantor_LIB_SRCS} )
 
 target_link_libraries( cantorlibs
+ PUBLIC
   ${KDE4_KDECORE_LIBS}
   ${KDE4_KIO_LIBS}
   ${QT_LIBRARIES}
diff --git a/src/lib/test/CMakeLists.txt b/src/lib/test/CMakeLists.txt
index 4bf1742..af56f18 100644
--- a/src/lib/test/CMakeLists.txt
+++ b/src/lib/test/CMakeLists.txt
@@ -5,7 +5,7 @@ set(cantortest_SRCS
 )
 
 kde4_add_library( cantortest SHARED ${cantortest_SRCS} )
-target_link_libraries( cantortest
+target_link_libraries( cantortest PUBLIC
   cantorlibs
   ${KDE4_KDECORE_LIBS}
   ${QT_QTTEST_LIBRARY}