[analitza/KDE/4.14] /: Add cmake_min_req matching kdelibs req & policies, fix build accordingly.

[David Faure]

Git commit 9c677d2ce90e1c0868f889728a1b765883bbb474 by David Faure.
Committed on 26/07/2015 at 14:05.
Pushed by dfaure into branch 'KDE/4.14'.

Add cmake_min_req matching kdelibs req & policies, fix build accordingly.

CCMAIL: kde-buildsystem at kde.org

M  +1    -0    CMakeLists.txt
M  +1    -1    analitza/CMakeLists.txt
M  +1    -1    analitzagui/CMakeLists.txt
M  +3    -1    analitzaplot/CMakeLists.txt
M  +1    -1    analitzaplot/tests/CMakeLists.txt

http://commits.kde.org/analitza/9c677d2ce90e1c0868f889728a1b765883bbb474

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b6296d..b7fb236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8.9)
 project(analitza)
 
 find_package(KDE4 REQUIRED)
diff --git a/analitza/CMakeLists.txt b/analitza/CMakeLists.txt
index 6315d32..b3ae939 100644
--- a/analitza/CMakeLists.txt
+++ b/analitza/CMakeLists.txt
@@ -45,7 +45,7 @@ set(analitza_SRCS
 )
 
 kde4_add_library(analitza SHARED ${analitza_SRCS})
-target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
+target_link_libraries(analitza LINK_PRIVATE ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
 
 set_target_properties(analitza PROPERTIES VERSION ${ANALITZA_LIB_VERSION} SOVERSION ${ANALITZA_LIB_SOVERSION} )
 
diff --git a/analitzagui/CMakeLists.txt b/analitzagui/CMakeLists.txt
index 2ac4834..224fd67 100644
--- a/analitzagui/CMakeLists.txt
+++ b/analitzagui/CMakeLists.txt
@@ -22,7 +22,7 @@ if(HAVE_OPENGL)
 endif(HAVE_OPENGL)
 
 kde4_add_library(analitzagui SHARED ${analitzagui_SRCS})
-target_link_libraries(analitzagui ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTOPENGL_LIBRARY} analitza analitzaplot)
+target_link_libraries(analitzagui LINK_PRIVATE ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTOPENGL_LIBRARY} analitza analitzaplot)
 
 set_target_properties(analitzagui PROPERTIES VERSION ${ANALITZA_LIB_VERSION} SOVERSION ${ANALITZA_LIB_SOVERSION} )
 
diff --git a/analitzaplot/CMakeLists.txt b/analitzaplot/CMakeLists.txt
index 040ce01..692242d 100644
--- a/analitzaplot/CMakeLists.txt
+++ b/analitzaplot/CMakeLists.txt
@@ -66,6 +66,7 @@ endif(HAVE_OPENGL)
 
 kde4_add_library( analitzaplot SHARED ${analitzaplot_SRCS} )
 target_link_libraries ( analitzaplot
+   LINK_PRIVATE
   ${QT_QTCORE_LIBRARY}
   ${QT_QTGUI_LIBRARY}
   ${KDE4_KDECORE_LIBS}
@@ -75,13 +76,14 @@ target_link_libraries ( analitzaplot
 
 if(HAVE_OPENGL)
     target_link_libraries ( analitzaplot
+     LINK_PRIVATE
         ${OPENGL_gl_LIBRARY}
         ${OPENGL_glu_LIBRARY}
     )
 endif(HAVE_OPENGL)
 
 if(WIN32)
-    target_link_libraries(analitzaplot ${GLEW_LIBRARIES})
+   target_link_libraries(analitzaplot LINK_PRIVATE ${GLEW_LIBRARIES})
 endif(WIN32)
 
 set_target_properties(analitzaplot PROPERTIES VERSION ${ANALITZA_LIB_VERSION} SOVERSION ${ANALITZA_LIB_SOVERSION} )
diff --git a/analitzaplot/tests/CMakeLists.txt b/analitzaplot/tests/CMakeLists.txt
index ce8e30f..fd4ab43 100644
--- a/analitzaplot/tests/CMakeLists.txt
+++ b/analitzaplot/tests/CMakeLists.txt
@@ -12,6 +12,6 @@ target_link_libraries(surfacetest ${testLibs})
 kde4_add_unit_test(plotsmodeltest plotsmodeltest.cpp)
 target_link_libraries(plotsmodeltest ${testLibs})
 
-add_definitions("-DSOURCE_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"")
+add_definitions(-DSOURCE_DIR="\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"")
 kde4_add_unit_test(plotsdictionarymodeltest plotsdictionarymodeltest.cpp)
 target_link_libraries(plotsdictionarymodeltest ${testLibs})