summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/video_core/CMakeLists.txt5
2 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 121b0f2f8..100fd9a62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
1# CMake 3.2 required for cmake to know the right flags for CXX standard on OSX 1# CMake 3.5 required for support for IMPORTED find_package libraries
2cmake_minimum_required(VERSION 3.2) 2cmake_minimum_required(VERSION 3.5)
3set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) 3set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
4 4
5function(download_bundled_external remote_path lib_name prefix_var) 5function(download_bundled_external remote_path lib_name prefix_var)
@@ -131,9 +131,7 @@ set_property(DIRECTORY APPEND PROPERTY
131 COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>) 131 COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
132 132
133find_package(PNG QUIET) 133find_package(PNG QUIET)
134if (PNG_FOUND) 134if (NOT PNG_FOUND)
135 add_definitions(-DHAVE_PNG)
136else()
137 message(STATUS "libpng not found. Some debugging features have been disabled.") 135 message(STATUS "libpng not found. Some debugging features have been disabled.")
138endif() 136endif()
139 137
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index e455f03bd..45f4ad2d5 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -87,7 +87,6 @@ if (ARCHITECTURE_x86_64)
87endif() 87endif()
88 88
89if (PNG_FOUND) 89if (PNG_FOUND)
90 target_link_libraries(video_core PRIVATE ${PNG_LIBRARIES}) 90 target_link_libraries(video_core PRIVATE PNG::PNG)
91 target_include_directories(video_core PRIVATE ${PNG_INCLUDE_DIRS}) 91 target_compile_definitions(video_core PRIVATE HAVE_PNG)
92 target_compile_definitions(video_core PRIVATE ${PNG_DEFINITIONS})
93endif() 92endif()