MirrorSave
/
libcaesium
mirror of https://github.com/Lymphatus/libcaesium.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing library path

This commit is contained in:
Lymphatus 2016-11-14 09:35:45 +01:00
parent 5e8d768131
commit cbb09b860a
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -1,23 +1,15 @@
cmake_minimum_required(VERSION 2.8.12) 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) project(libcaesium)
set(CMAKE_MACOSX_RPATH 1) 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) set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
#add_executable(libcaesium ${SOURCE_FILES})
add_subdirectory(caesium) add_subdirectory(caesium)
add_subdirectory(demo) add_subdirectory(demo)

9
caesium/CMakeLists.txt
View File

@ -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(zoflipng zopflipng /usr/local/lib)
find_library(jpeg jpeg /opt/mozjpeg/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) set_target_properties(caesium_static PROPERTIES OUTPUT_NAME caesium)
target_link_libraries(caesium zopflipng) target_link_libraries(caesium zopflipng jpeg turbojpeg)
target_link_libraries(caesium jpeg)
target_link_libraries(caesium turbojpeg)
# Make sure the compiler can find include files for our Caesium library # Make sure the compiler can find include files for our Caesium library
# when other libraries or executables link to Caesium # when other libraries or executables link to Caesium
target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})