diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-09-12 11:33:36 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-09-12 11:33:36 -0500 |
| commit | 4daec9e314f0de5791c2e713d3851fe9b2c94de9 (patch) | |
| tree | 16f3b05fcaecffe66bac65d9c6af9de4c4ed6cf1 | |
| parent | 28b080a4bf53f3cc915fda89537e2bf68346e950 (diff) | |
| parent | ea7811818e3d5eb785a13a629f998f423ecf228b (diff) | |
| download | tdelibs-4daec9e314f0de5791c2e713d3851fe9b2c94de9.tar.gz tdelibs-4daec9e314f0de5791c2e713d3851fe9b2c94de9.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
| -rw-r--r-- | arts/kde/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tdelfeditor/tdelfeditor.cpp | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 3b585256d..091be3526 100644 --- 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 ) diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index d982bea5d..23c95a05a 100644 --- 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" { |