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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdegraphics=5D_/=3A_Some_cleanup?=
From:       Alex Neundorf <neundorf () kde ! org>
Date:       2011-05-31 19:43:27
Message-ID: 20110531194327.ADE99A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 4b88f4cd915cfd62eda86be364166dc3ea994327 by Alex Neundorf.
Committed on 31/05/2011 at 21:41.
Pushed by neundorf into branch 'master'.

Some cleanup
-all lower-case
-the directory CMAKE_SOURCE_DIR/cmake/modules/ does not exist (or am I
missing something ?)
-fix indentation

Alex

M  +4    -7    CMakeLists.txt     
D  +0    -3    cmake/CMakeLists.txt     

http://commits.kde.org/kdegraphics/4b88f4cd915cfd62eda86be364166dc3ea994327

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d895315..331d4ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,14 @@
 project(kdegraphics)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
+option(BUILD_LIBS "build kdegraphics library" ON)
 
-OPTION(BUILD_LIBS "build kdegraphics library" ON)
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
 include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
+
 if( WIN32 )
-find_package( Expat )
+  find_package( Expat )
 endif( WIN32 )
 
 #required by okular
@@ -29,10 +28,8 @@ macro_optional_find_package(Kexiv2)
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
 include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
-
-add_subdirectory(cmake)
 if (BUILD_LIBS)
-    add_subdirectory(libs)
+  add_subdirectory(libs)
 endif(BUILD_LIBS)
 if(QIMAGEBLITZ_FOUND)
   macro_optional_add_subdirectory(okular)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
deleted file mode 100644
index 38a9971..0000000
--- a/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-add_subdirectory(modules)
-

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