Fix OSX build

eustas · eustas · commit 5126d62d24d3 · 2024-12-06T15:42:51.000+01:00
diff --git a/lib/jpegli.cmake b/lib/jpegli.cmake
@@ -37,8 +37,6 @@ target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})
 set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_include_directories(jpegli-static PRIVATE
   "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
   "${JXL_HWY_INCLUDE_DIRS}"
 )
 target_include_directories(jpegli-static PUBLIC
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -80,7 +80,9 @@ if(JPEGXL_ENABLE_TOOLS)
   # Depends on parts of jxl_extras that are only built if libjpeg is found and
   # jpegli is enabled.
   add_executable(cjpegli cjpegli.cc)
+  target_link_libraries(cjpegli jpegli-static)
   add_executable(djpegli djpegli.cc)
+  target_link_libraries(djpegli jpegli-static)
   list(APPEND INTERNAL_TOOL_BINARIES cjpegli djpegli)
 endif()  # JPEGXL_ENABLE_TOOLS
 

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})`
`37`	`37`	`set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)`
`38`	`38`	`target_include_directories(jpegli-static PRIVATE`
`39`	`39`	`"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"`
`40`		`- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"`
`41`		`- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"`
`42`	`40`	`"${JXL_HWY_INCLUDE_DIRS}"`
`43`	`41`	`)`
`44`	`42`	`target_include_directories(jpegli-static PUBLIC`