mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up some wrong parts I missed to conform with the rest of my changes.

Browse Source
This commit is contained in:
King_DuckZ 2017-11-10 00:29:07 +00:00
parent 32e6ee532c
commit b9946f2624
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -227,7 +227,7 @@ if(NANA_CMAKE_ENABLE_PNG)
if(NANA_CMAKE_LIBPNG_FROM_OS) if(NANA_CMAKE_LIBPNG_FROM_OS)
find_package(PNG) find_package(PNG)
if (PNG_FOUND) if (PNG_FOUND)
target_include_directories(${PROJECT_NAME} PRIVATE PNG::PNG) target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE PNG::PNG)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBPNG_FROM_OS) target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBPNG_FROM_OS)
endif(PNG_FOUND) endif(PNG_FOUND)
else() else()
@ -241,12 +241,12 @@ if(NANA_CMAKE_ENABLE_JPEG)
if(NANA_CMAKE_LIBJPEG_FROM_OS) if(NANA_CMAKE_LIBJPEG_FROM_OS)
find_package(JPEG) find_package(JPEG)
if (JPEG_FOUND) if (JPEG_FOUND)
target_include_directories(${PROJECT_NAME PRIVATE ${JPEG_INCLUDE_DIR}) target_include_directories(${PROJECT_NAME SYSTEM PRIVATE ${JPEG_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} PRIVATE ${JPEG_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${JPEG_LIBRARIES})
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBJPEG_FROM_OS) target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBJPEG_FROM_OS)
endif(JPEG_FOUND) endif(JPEG_FOUND)
else() else()
add_definitions(-DNANA_ENABLE_JPEG) target_compile_definitions(${PROJECT_NAME} PUBLIC NANA_ENABLE_JPEG)
endif(NANA_CMAKE_LIBJPEG_FROM_OS) endif(NANA_CMAKE_LIBJPEG_FROM_OS)
endif(NANA_CMAKE_ENABLE_JPEG) endif(NANA_CMAKE_ENABLE_JPEG)