Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

11 years ago · 4daec9e314
parent 28b080a4bf ea7811818e
commit 4daec9e314
2 changed files with 2 additions and 6 deletions
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@ -27,11 +27,6 @@ link_directories(
  ${ARTS_LIBRARY_DIRS}
 )

-# pkg-config stripping -I/usr/include
-if( NOT ARTS_INCLUDE_DIRS )
-  set( ARTS_INCLUDE_DIRS "/usr/include" )
-endif()
-

 ##### headers ###################################

@ -58,7 +53,7 @@ set( ${target}_SRCS
 add_custom_command(
  OUTPUT artskde.cc artskde.h
  COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
-    -I${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
+    -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
  DEPENDS artskde.idl
 )

--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@ -30,6 +30,7 @@

 /* Obtaining command-line options */
 #include <getopt.h>
+#include <cstdlib>

 /* Internationalization support */
 extern "C" {