From 32fbf704305a940cc8a922476f712f824208ad0f Mon Sep 17 00:00:00 2001 From: Matteo Paonessa Date: Wed, 22 Jan 2020 20:26:17 +0100 Subject: [PATCH] Variables in CMake build script --- CMakeLists.txt | 39 ++++++++++++++++++++++++--------------- caesium/CMakeLists.txt | 12 +++--------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0717a6..7c0cce3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,25 +24,34 @@ configure_file( include_directories("${PROJECT_BINARY_DIR}") if (APPLE) - link_directories(/opt/mozjpeg/lib) - - include_directories(/opt/mozjpeg/include) - include_directories(/usr/local/include) + set(MOZJPEG_DEFAULT_PATH /opt/mozjpeg) + set(ZOPFLI_DEFAULT_PATH /usr/local) elseif (WIN32) - include_directories(C:\\mozjpeg\\include) - include_directories(C:\\zopfli\\src) + set(MOZJPEG_DEFAULT_PATH C:\\mozjpeg) + set(ZOPFLI_DEFAULT_PATH C:\\zopfli) else () - include_directories(/opt/mozjpeg/include) - include_directories(/usr/include/zopflipng) - - if (EXISTS /opt/mozjpeg/lib64) - link_directories(/opt/mozjpeg/lib64) - else () - link_directories(/opt/mozjpeg/lib) - endif () + set(MOZJPEG_DEFAULT_PATH /opt/mozjpeg) + set(ZOPFLI_DEFAULT_PATH /usr) 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(demo) diff --git a/caesium/CMakeLists.txt b/caesium/CMakeLists.txt index 8f142ff..eb13752 100644 --- a/caesium/CMakeLists.txt +++ b/caesium/CMakeLists.txt @@ -4,15 +4,9 @@ else () set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}") endif () -if (APPLE) - find_library(zopflipng zopflipng /usr/local/lib) - find_library(jpeg jpeg /usr/local/opt/mozjpeg/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 () +find_library(jpeg jpeg ${MOZJPEG_PATH}/lib) +find_library(turbojpeg turbojpeg ${MOZJPEG_PATH}/lib) +find_library(zopflipng zopflipng ${ZOPFLI_PATH}/lib) add_library(caesium SHARED caesium.c error.c utils.c png.c vendor/lodepng.c jpeg.c) add_library(caesium_static STATIC caesium.c error.c utils.c png.c vendor/lodepng.c jpeg.c)