From 54c9be2c4c38ef1e71db866bb67310e2c2511ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 11 Jun 2015 02:38:01 +0200 Subject: [PATCH] Add include directory for internal libltdl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit dfd680030c18adaa4f299a4092d9ac6d5945cadc) --- CMakeLists.txt | 4 +++- tdeinit/CMakeLists.txt | 1 + tdeio/tdeio/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) 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