From ee9e1b7c3d4c70e206507bb402a32e677aacb14a Mon Sep 17 00:00:00 2001 From: zedar187 Date: Mon, 30 Dec 2019 14:42:10 +0100 Subject: [PATCH] CMakeLists: jpegturbo - remove unnecessary if for JPEG_BUNDLED_INCLUDE_DIR --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 068b32cb..a703426a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -723,11 +723,7 @@ if(BUNDLED_JPEG AND BUILD_CLIENT) #ExternalProject_Get_Property(bundled_jpeg binary_dir) - if(WIN32 OR APPLE) - set(JPEG_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/jpegturbo") - else() - set(JPEG_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libs/jpegturbo/include") - endif() + set(JPEG_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/jpegturbo") set_target_properties(bundled_jpeg PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) endif()