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

List:       kde-commits
Subject:    KDE/kdelibs/solid/examples
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-04-17 21:12:06
Message-ID: 1208466726.649899.28144.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 798271 by neundorf:

remove unnecessary code

Alex

CCMAIL: cblauvelt@gmail.com

Christopher: let me know if something breaks



 M  +2 -6      tutorial1/CMakeLists.txt  
 M  +3 -11     tutorial2/CMakeLists.txt  
 M  +3 -11     tutorial3/CMakeLists.txt  
 M  +3 -11     tutorial4/CMakeLists.txt  
 M  +3 -11     tutorial5/CMakeLists.txt  
 M  +3 -13     tutorial6/CMakeLists.txt  


--- trunk/KDE/kdelibs/solid/examples/tutorial1/CMakeLists.txt #798270:798271
@@ -1,16 +1,12 @@
 project(tutorial1)
 
-set(tutorial1_SRCS
- tutorial1.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
 
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
 
-kde4_add_executable(tutorial1 ${tutorial1_SRCS})
+kde4_add_executable(tutorial1 tutorial1.cpp )
 
 target_link_libraries(tutorial1  ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} )
--- trunk/KDE/kdelibs/solid/examples/tutorial2/CMakeLists.txt #798270:798271
@@ -1,21 +1,13 @@
 project(tutorial2)
 
-set(tutorial2_SRCS
- tutorial2.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
-find_package(Perl REQUIRED)
-find_package(ZLIB REQUIRED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-link_directories(${KDE4_LIB_DIR})
 
+set(tutorial2_SRCS tutorial2.cpp )
 
 kde4_add_executable(tutorial2 ${tutorial2_SRCS})
 
--- trunk/KDE/kdelibs/solid/examples/tutorial3/CMakeLists.txt #798270:798271
@@ -1,21 +1,13 @@
 project(tutorial3)
 
-set(tutorial3_SRCS
- tutorial3.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
-find_package(Perl REQUIRED)
-find_package(ZLIB REQUIRED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-link_directories(${KDE4_LIB_DIR})
 
+set(tutorial3_SRCS tutorial3.cpp )
 
 kde4_add_executable(tutorial3 ${tutorial3_SRCS})
 
--- trunk/KDE/kdelibs/solid/examples/tutorial4/CMakeLists.txt #798270:798271
@@ -1,21 +1,13 @@
 project(tutorial4)
 
-set(tutorial4_SRCS
- tutorial4.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
-find_package(Perl REQUIRED)
-find_package(ZLIB REQUIRED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
-link_directories(${KDE4_LIB_DIR})
 
+set(tutorial4_SRCS  tutorial4.cpp )
 
 kde4_add_executable(tutorial4 ${tutorial4_SRCS})
 
--- trunk/KDE/kdelibs/solid/examples/tutorial5/CMakeLists.txt #798270:798271
@@ -1,21 +1,13 @@
 project(tutorial5)
 
-set(tutorial5_SRCS
- tutorial5.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
-find_package(Perl REQUIRED)
-find_package(ZLIB REQUIRED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
-link_directories(${KDE4_LIB_DIR})
 
+set(tutorial5_SRCS tutorial5.cpp )
 
 kde4_add_executable(tutorial5 ${tutorial5_SRCS})
 
--- trunk/KDE/kdelibs/solid/examples/tutorial6/CMakeLists.txt #798270:798271
@@ -1,24 +1,14 @@
 project(tutorial6)
 
-set(tutorial6_SRCS
- tutorial6.cpp
- webcamwatcher.cpp
-)
-
-# search packages used by KDE
+# search KDE4 and use apply default (but optional) settings
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-include(MacroLibrary)
-#find_package(Perl REQUIRED)
-#find_package(ZLIB REQUIRED)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 add_definitions(${QT_DEFINITIONS} ${QDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
-link_directories(${KDE4_LIB_DIR})
 
+set(tutorial6_SRCS  tutorial6.cpp  webcamwatcher.cpp )
 
 kde4_add_executable(tutorial6 ${tutorial6_SRCS})
-#target_link_libraries(tutorial6  ${KDE4_SOLID_LIBS} )
 target_link_libraries(tutorial6  ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} )
 
[prev in list] [next in list] [prev in thread] [next in thread]