-cleanup the toplevel CMakeLists.txt a bit

-remove include_directories( CMAKE_CURRENT_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR) in the subdirs, since this is done now automatically by cmake (the CMAKE_INCLUDE_CURRENT_DIR option -include_directories(KDE4_INCLUDES) in the toplevel CMakeLists.txt, so it doesn't have to be done in every subdir Alex svn path=/trunk/KDE/kdepim/kontact/src/; revision=539795
20 years ago · ac4a959ec0
parent 48c5970c53
commit ac4a959ec0
7 changed files with 8 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmail.h )
+configure_file(config-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmail.h )


 add_subdirectory( interfaces ) 
@ -16,7 +16,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkmime ${CMAKE_SOURCE_DIR}/libkpgp
  ${CMAKE_SOURCE_DIR}/mimelib ${CMAKE_SOURCE_DIR}/libkleo
  ${CMAKE_SOURCE_DIR}/indexlib
  ${GPGME_INCLUDES}
-  ${KDE4_INCLUDES} )
+   )


 ########### next target ###############
--- a/about/CMakeLists.txt
+++ b/about/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+


 ########### install files ###############
--- a/avscripts/CMakeLists.txt
+++ b/avscripts/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+


 ########### install files ###############
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+


 ########### install files ###############
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@ -2,7 +2,7 @@ kde4_header()

 add_subdirectory( icons ) 

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+


 ########### install files ###############
--- a/profiles/CMakeLists.txt
+++ b/profiles/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+


 ########### install files ###############
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/kmail ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/kmail  )


 ########### install files ###############