From 9d741c36f99066c71541a2bd31d557dbb5a9a858 Mon Sep 17 00:00:00 2001 From: rude Date: Mon, 21 Apr 2014 15:10:35 +0200 Subject: [PATCH] libjpeg-turbo: Include directories using target_include_directories. --- libs/libjpeg-turbo/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libjpeg-turbo/CMakeLists.txt b/libs/libjpeg-turbo/CMakeLists.txt index 6d09b975..44a19aa2 100644 --- a/libs/libjpeg-turbo/CMakeLists.txt +++ b/libs/libjpeg-turbo/CMakeLists.txt @@ -139,10 +139,10 @@ endif() message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}") -configure_file(win/jconfig.h.in jconfig.h) +configure_file(win/jconfig.h.in include/jconfig.h) configure_file(win/config.h.in config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include) if(WITH_JAVA) find_package(Java) @@ -199,6 +199,7 @@ endif() #add_subdirectory(sharedlib) add_library(jpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS}) +target_include_directories(jpeg-static PUBLIC . ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include) if(NOT MSVC) set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg) endif()