Merge branch 'static'
This commit is contained in:
commit
093036ea15
|
@ -24,25 +24,34 @@ configure_file(
|
||||||
include_directories("${PROJECT_BINARY_DIR}")
|
include_directories("${PROJECT_BINARY_DIR}")
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
link_directories(/opt/mozjpeg/lib)
|
set(MOZJPEG_DEFAULT_PATH /opt/mozjpeg)
|
||||||
|
set(ZOPFLI_DEFAULT_PATH /usr/local)
|
||||||
include_directories(/opt/mozjpeg/include)
|
|
||||||
include_directories(/usr/local/include)
|
|
||||||
elseif (WIN32)
|
elseif (WIN32)
|
||||||
include_directories(C:\\mozjpeg\\include)
|
set(MOZJPEG_DEFAULT_PATH C:\\mozjpeg)
|
||||||
include_directories(C:\\zopfli\\src)
|
set(ZOPFLI_DEFAULT_PATH C:\\zopfli)
|
||||||
else ()
|
else ()
|
||||||
include_directories(/opt/mozjpeg/include)
|
set(MOZJPEG_DEFAULT_PATH /opt/mozjpeg)
|
||||||
include_directories(/usr/include/zopflipng)
|
set(ZOPFLI_DEFAULT_PATH /usr)
|
||||||
|
|
||||||
if (EXISTS /opt/mozjpeg/lib64)
|
|
||||||
link_directories(/opt/mozjpeg/lib64)
|
|
||||||
else ()
|
|
||||||
link_directories(/opt/mozjpeg/lib)
|
|
||||||
endif ()
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
link_directories(/usr/local/lib)
|
|
||||||
|
if (NOT DEFINED MOZJPEG_PATH)
|
||||||
|
set(MOZJPEG_PATH ${MOZJPEG_DEFAULT_PATH})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT DEFINED ZOPFLI_PATH)
|
||||||
|
set(ZOPFLI_PATH ${ZOPFLI_DEFAULT_PATH})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include_directories(${MOZJPEG_PATH}/include)
|
||||||
|
include_directories(${ZOPFLI_PATH}/include)
|
||||||
|
|
||||||
|
if (EXISTS ${MOZJPEG_PATH}/lib64)
|
||||||
|
link_directories(${MOZJPEG_PATH}/lib64)
|
||||||
|
else ()
|
||||||
|
link_directories(${MOZJPEG_PATH}/lib)
|
||||||
|
endif ()
|
||||||
|
link_directories(${ZOPFLI_PATH}/lib)
|
||||||
|
|
||||||
add_subdirectory(caesium)
|
add_subdirectory(caesium)
|
||||||
add_subdirectory(demo)
|
add_subdirectory(demo)
|
||||||
|
|
|
@ -4,15 +4,9 @@ else ()
|
||||||
set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
|
set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (APPLE)
|
find_library(jpeg jpeg ${MOZJPEG_PATH}/lib)
|
||||||
find_library(zopflipng zopflipng /usr/local/lib)
|
find_library(turbojpeg turbojpeg ${MOZJPEG_PATH}/lib)
|
||||||
find_library(jpeg jpeg /usr/local/opt/mozjpeg/lib)
|
find_library(zopflipng zopflipng ${ZOPFLI_PATH}/lib)
|
||||||
find_library(turbojpeg turbojpeg /usr/local/opt/mozjpeg/lib)
|
|
||||||
ELSE()
|
|
||||||
find_library(zopflipng zopflipng /usr/lib)
|
|
||||||
find_library(jpeg jpeg /opt/mozjpeg/lib)
|
|
||||||
find_library(turbojpeg turbojpeg /opt/mozjpeg/lib)
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
add_library(caesium SHARED caesium.c error.c utils.c png.c vendor/lodepng.c jpeg.c)
|
add_library(caesium SHARED caesium.c error.c utils.c png.c vendor/lodepng.c jpeg.c)
|
||||||
|
|
||||||
|
@ -22,17 +16,6 @@ target_link_libraries(caesium jpeg turbojpeg zopflipng)
|
||||||
# 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})
|
||||||
|
|
||||||
# OSX installs in local
|
install(FILES caesium.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
|
||||||
if (APPLE)
|
|
||||||
install(FILES caesium.h DESTINATION /usr/local/include)
|
|
||||||
install(TARGETS caesium
|
install(TARGETS caesium
|
||||||
LIBRARY DESTINATION /usr/local/lib)
|
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||||
elseif (UNIX OR LINUX)
|
|
||||||
install(FILES caesium.h DESTINATION /usr/include)
|
|
||||||
install(TARGETS caesium
|
|
||||||
LIBRARY DESTINATION /usr/lib)
|
|
||||||
else ()
|
|
||||||
install(FILES caesium.h DESTINATION include)
|
|
||||||
install(TARGETS caesium
|
|
||||||
LIBRARY DESTINATION lib)
|
|
||||||
endif ()
|
|
Loading…
Reference in New Issue