alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up include dirs

Browse Source
This commit is contained in:
Sebastian Kügler 2013-02-14 17:32:41 +01:00
parent 7dfe957e66
commit fe528a6fea
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -135,7 +135,7 @@ include_directories( ${kdeqt5staging_INCLUDE_DIRS} ${kdeqt5staging_INCLUDE_DIR}
) )
# for including config.h and for includes like <kparts/foo.h> # for including config.h and for includes like <kparts/foo.h>
include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/plasma/includes) include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}src/plasma/includes)
if(QCA2_FOUND) if(QCA2_FOUND)
include_directories( include_directories(

4
src/plasma/CMakeLists.txt
View File

@ -26,8 +26,6 @@ endif(NOT X11_FOUND)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/src
${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}
${KDE4_INCLUDE_DIR}/KDE ${KDE4_INCLUDE_DIR}/KDE
${ki18n_SOURCE_DIR}/src ${ki18n_SOURCE_DIR}/src
@ -38,6 +36,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/ ${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
) )
if(NOT PLASMA_NO_KIO) if(NOT PLASMA_NO_KIO)
include_directories(${KDE4_KIO_INCLUDES}) include_directories(${KDE4_KIO_INCLUDES})
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KIO_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KIO_LIBS})

2
src/plasma/private/packages.cpp
View File

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA. * * Boston, MA 02110-1301, USA. *
*******************************************************************************/ *******************************************************************************/
#include "packages_p.h" #include "plasma/private/packages_p.h"
#include <math.h> #include <math.h>
#include <float.h> // FLT_MAX #include <float.h> // FLT_MAX

2
src/plasma/servicejob.cpp
View File

@ -21,7 +21,7 @@
#include <kdebug.h> #include <kdebug.h>
#include "private/servicejob_p.h" #include <plasma/private/servicejob_p.h>
namespace Plasma namespace Plasma
{ {