Skip to content
Snippets Groups Projects
Commit df6cb303 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix small cmake errors on macos

parent 62593768
No related branches found
No related tags found
No related merge requests found
......@@ -135,7 +135,6 @@ elseif(DARWIN)
libapr-1.dylib
libaprutil-1.0.dylib
libaprutil-1.dylib
libexception_handler.dylib
${EXPAT_COPY}
libGLOD.dylib
libhunspell-1.3.0.dylib
......
......@@ -8,14 +8,12 @@ set(JPEG_FIND_REQUIRED ON)
if (USESYSTEMLIBS)
include(FindJPEG)
else (USESYSTEMLIBS)
use_prebuilt_binary(libjpeg-turbo)
if (LINUX)
use_prebuilt_binary(libjpeg-turbo)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
use_prebuilt_binary(jpeglib)
set(JPEG_LIBRARIES jpeg)
elseif (WINDOWS)
use_prebuilt_binary(libjpeg-turbo)
set(JPEG_LIBRARIES jpeg)
endif (LINUX)
set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
......
......@@ -299,7 +299,7 @@ target_link_libraries(
if (DARWIN)
include(CMakeFindFrameworks)
find_library(CARBON_LIBRARY Carbon)
target_link_libraries(llcommon ${CARBON_LIBRARY})
target_link_libraries(llcommon PUBLIC ${CARBON_LIBRARY})
endif (DARWIN)
add_dependencies(llcommon stage_third_party_libs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment