From cbb09b860a6eaad4fe654215cea1ac4f852aa2e5 Mon Sep 17 00:00:00 2001
From: Lymphatus <matteo.paonessa@gmail.com>
Date: Mon, 14 Nov 2016 09:35:45 +0100
Subject: [PATCH] Fixing library path

---
 CMakeLists.txt         | 20 ++++++--------------
 caesium/CMakeLists.txt |  9 ++++-----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c4f8c5..8444c26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,15 @@
 cmake_minimum_required(VERSION 2.8.12)
 
-macro(use_c99)
-    if (CMAKE_VERSION VERSION_LESS "3.1")
-        if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-            set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
-        endif ()
-    else ()
-        set(CMAKE_C_STANDARD 99)
-    endif ()
-endmacro(use_c99)
-
 project(libcaesium)
 
 set(CMAKE_MACOSX_RPATH 1)
+set(MOZJPEG_INCLUDE /opt/mozjpeg/include)
+set(MOZJPEG_LIB /opt/mozjpeg/lib64)
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+include_directories(${MOZJPEG_INCLUDE})
+link_directories(${MOZJPEG_LIB})
 
-#set(SOURCE_FILES demo/main.cpp)
-#add_executable(libcaesium ${SOURCE_FILES})
+set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
 
 add_subdirectory(caesium)
-add_subdirectory(demo)
\ No newline at end of file
+add_subdirectory(demo)
diff --git a/caesium/CMakeLists.txt b/caesium/CMakeLists.txt
index a543548..bff155e 100644
--- a/caesium/CMakeLists.txt
+++ b/caesium/CMakeLists.txt
@@ -1,4 +1,4 @@
-use_c99()
+set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
 
 find_library(zoflipng zopflipng /usr/local/lib)
 find_library(jpeg jpeg /opt/mozjpeg/lib)
@@ -9,9 +9,8 @@ add_library(caesium_static STATIC caesium.c error.c utils.c png.c lodepng.c jpeg
 
 set_target_properties(caesium_static PROPERTIES OUTPUT_NAME caesium)
 
-target_link_libraries(caesium zopflipng)
-target_link_libraries(caesium jpeg)
-target_link_libraries(caesium turbojpeg)
+target_link_libraries(caesium zopflipng jpeg turbojpeg)
+
 # Make sure the compiler can find include files for our Caesium library
 # when other libraries or executables link to Caesium
-target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
\ No newline at end of file
+target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})