From 4df773d283c14c92d5baa8b1e0487479d32d5baf Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 22 Mar 2017 10:24:33 +0100
Subject: [PATCH] Some fixes in cmake. Note that you need updated dependencies
 on windows.

---
 CMakeLists.txt | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9ca6d4e..f8e450921 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,22 +107,21 @@ if((WIN32 AND NOT MINGW) OR APPLE)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
     include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
 
-    # Add jpeg-turbo library
-    if (APPLE)
-        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-        include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-        set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
-        set(JPEG_LIBRARY jpeglib)
-    else()
-        find_library(JPEG_LIBRARY NAMES libjpeg-62 PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
-        find_path(JPEG_INCLUDE_DIRS NAMES jpeglib.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
-        set(JPEG_LIBRARIES ${JPEG_LIBRARY})
-    endif()
-
     set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
     set(PNG_LIBRARY png15_static)
 endif()
 
+# Add jpeg-turbo library
+if (APPLE)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+    set(JPEG_LIBRARY jpeglib)
+else()
+    find_package(JPEG REQUIRED)
+    include_directories(${JPEG_INCLUDE_DIR})
+endif()
+
 if(NOT SERVER_ONLY AND NOT USE_GLES2)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
     include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
@@ -380,6 +379,7 @@ target_link_libraries(supertuxkart
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
     ${FREETYPE_LIBRARIES}
+    ${JPEG_LIBRARIES}
     )
 
 if(NOT SERVER_ONLY)
@@ -420,10 +420,6 @@ if(USE_FRIBIDI)
     add_definitions(-DENABLE_BIDI)
 endif()
 
-if(MSVC)
-    target_link_libraries(supertuxkart ${JPEG_LIBRARIES})
-endif()
-
 # Wiiuse
 # ------
 if(USE_WIIUSE)