summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2015-06-11 02:38:01 +0200
committerSlávek Banko <[email protected]>2015-06-11 03:03:49 +0200
commit54c9be2c4c38ef1e71db866bb67310e2c2511ee0 (patch)
tree68ad185aa94425ab689b5d74791077516cfbe28c
parent43174373032e1198981312b3b527f719b0a5d38b (diff)
downloadtdelibs-54c9be2c4c38ef1e71db866bb67310e2c2511ee0.tar.gz
tdelibs-54c9be2c4c38ef1e71db866bb67310e2c2511ee0.zip
Add include directory for internal libltdl
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit dfd680030c18adaa4f299a4092d9ac6d5945cadc)
-rw-r--r--CMakeLists.txt4
-rw-r--r--tdeinit/CMakeLists.txt1
-rw-r--r--tdeio/tdeio/CMakeLists.txt1
3 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8f384b6f..5a0184166 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,10 +153,12 @@ endif( NO_BUILTIN )
##### system checks #############################
+tde_save_and_set( CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libltdl )
check_include_file( "ltdl.h" HAVE_LTDL_H )
if( NOT HAVE_LTDL_H )
- tde_message_fatal( "ltdl.h are required, but not found on your system" )
+ tde_message_fatal( "ltdl.h is required, but not found on your system" )
endif( )
+tde_restore( CMAKE_REQUIRED_INCLUDES )
check_include_file( "alloca.h" HAVE_ALLOCA_H )
check_include_file( "arpa/nameser8_compat.h" HAVE_ARPA_NAMESER8_COMPAT_H )
diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index 741d60004..f4124e5d3 100644
--- a/tdeinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -17,6 +17,7 @@ include_directories(
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
+ ${CMAKE_SOURCE_DIR}/libltdl
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/tdeio
diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 77d16f2c7..b4487db7f 100644
--- a/tdeio/tdeio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
+ ${CMAKE_SOURCE_DIR}/libltdl
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/tdeui