[kgraphviewer-devel] [kgraphviewer] /: cmake: remove obsolete stuff
Pino Toscano
pino at kde.org
Mon Mar 4 21:41:22 UTC 2013
Git commit cfd12f9e7d884f0dfffde249745d76583dc1b99c by Pino Toscano.
Committed on 04/03/2013 at 22:40.
Pushed by pino into branch 'master'.
cmake: remove obsolete stuff
- do not search for zlib and (on mac os x) carbon, they are not used directly
- no need to specify link_directories, cmake properly handle linking also with full paths
M +0 -6 CMakeLists.txt
M +0 -5 src/part/CMakeLists.txt
http://commits.kde.org/kgraphviewer/cfd12f9e7d884f0dfffde249745d76583dc1b99c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a27665..001369e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,6 @@ find_package(KDE4 REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
-# are these two really required ?
-find_package(ZLIB REQUIRED)
-if (APPLE)
- find_package(Carbon REQUIRED)
-endif (APPLE)
-
find_package(Boost 1.36 REQUIRED)
find_package(GraphViz REQUIRED)
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
index 4937e18..6377add 100644
--- a/src/part/CMakeLists.txt
+++ b/src/part/CMakeLists.txt
@@ -1,10 +1,5 @@
include_directories( ../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${graphviz_INCLUDE_DIRECTORIES} )
-link_directories(
- ${CMAKE_BINARY_DIR}/lib
- ${LIB_INSTALL_DIR}
-)
-
########### next target ###############
set( kgraphviewerlib_LIB_SRCS loadagraphthread.cpp layoutagraphthread.cpp graphelement.cpp graphsubgraph.cpp graphnode.cpp graphedge.cpp graphexporter.cpp pannerview.cpp canvassubgraph.cpp canvasnode.cpp canvasedge.cpp canvaselement.cpp dotgraph.cpp dotgraphview.cpp dot2qtconsts.cpp dotgrammar.cpp DotGraphParsingHelper.cpp FontsCache.cpp simpleprintingsettings.cpp simpleprintingengine.cpp simpleprintingcommand.cpp simpleprintingpagesetup.cpp simpleprintpreviewwindow_p.cpp simpleprintpreviewwindow.cpp KgvGlobal.cpp KgvUnit.cpp KgvUnitWidgets.cpp KgvPageLayoutColumns.cpp KgvPageLayoutDia.cpp KgvPageLayout.cpp KgvPageLayoutHeader.cpp KgvPageLayoutSize.cpp)
More information about the kgraphviewer-devel
mailing list