From 797efbf2c552b99171b9e4fa69ddd21150201617 Mon Sep 17 00:00:00 2001 From: Matteo Paonessa Date: Wed, 11 Dec 2019 00:50:44 +0100 Subject: [PATCH] Build path fixes --- CMakeLists.txt | 6 +++--- caesium/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3dbb59..b77ccbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,10 @@ configure_file( include_directories("${PROJECT_BINARY_DIR}") if (APPLE) - link_directories(/usr/local/opt/mozjpeg/lib) + link_directories(/opt/mozjpeg/lib) - include_directories(/usr/local/opt/mozjpeg/include) - include_directories(/usr/local/include/zopflipng) + include_directories(/opt/mozjpeg/include) + include_directories(/usr/local/include) elseif(WIN32) include_directories(C:\\mozjpeg\\include) include_directories(C:\\zopfli\\src) diff --git a/caesium/CMakeLists.txt b/caesium/CMakeLists.txt index d44d290..aa0f0c7 100644 --- a/caesium/CMakeLists.txt +++ b/caesium/CMakeLists.txt @@ -1,5 +1,5 @@ if (NOT WIN32) - set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}") + set(CMAKE_C_FLAGS "--std=gnu99 -fPIC -Wno-nullability-completeness ${CMAKE_C_FLAGS}") else () set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}") endif ()