From 317148a37d2262ae0397ecd735fc287ee873a6c2 Mon Sep 17 00:00:00 2001 From: Godzil Date: Thu, 5 Mar 2020 15:13:40 +0000 Subject: [PATCH] Lua include is only added if lua support is enabled. Add NanoJPEG dependency to the main library --- source/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 73b841e..2578a42 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -19,11 +19,12 @@ target_include_directories(rayonnement PUBLIC include pattern) if (USE_LUA) add_dependencies(rayonnement LuaCore) target_link_libraries(rayonnement ${LUA_LIBRARIES}) + target_include_directories(rayonnement PUBLIC ${LUA_INCLUDE_DIR}) endif() -target_include_directories(rayonnement PUBLIC include ${LODEPNG_INCLUDE_FOLDER} ${LUA_INCLUDE_DIR}) +target_include_directories(rayonnement PUBLIC include ${LODEPNG_INCLUDE_FOLDER} ${NANOJPEG_INCLUDE_FOLDER}) target_sources(rayonnement PRIVATE ${RAY_HEADERS} ${RAY_SOURCES}) -target_link_libraries(rayonnement LodePNG) +target_link_libraries(rayonnement LodePNG NanoJPEG) if (USE_OPENMP) target_link_libraries(rayonnement OpenMP::OpenMP_CXX)