Skip to content

Commit 959dc37

Browse files
committed
Change cmake
1 parent 6bbefd2 commit 959dc37

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

CMakeLists.txt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@ cmake_minimum_required(VERSION 3.7)
22
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
33
project(pixelsort)
44

5-
find_package(PNG REQUIRED)
6-
include_directories(${PNG_INCLUDE_DIR})
7-
8-
set(CMAKE_CXX_STANDARD 11)
5+
include (FindPkgConfig)
6+
if (NOT PKG_CONFIG_FOUND)
7+
message (FATAL_ERROR "pkg-config not found")
8+
endif ()
99

10+
pkg_check_modules (LIBPNG libpng16 REQUIRED)
11+
if (NOT LIBPNG_FOUND)
12+
message(FATAL_ERROR "You don't seem to have libpng16 development libraries installed")
13+
else ()
14+
include_directories (${LIBPNG_INCLUDE_DIRS})
15+
link_directories (${LIBPNG_LIBRARY_DIRS})
16+
link_libraries (${LIBPNG_LIBRARIES})
17+
endif ()
1018

1119
set(SOURCE_FILES
1220
src/main.c
1321
src/read_write.h)
1422

15-
add_executable(pixelsort ${SOURCE_FILES})
16-
target_link_libraries(pixelsort ${PNG_LIBRARY})
23+
add_executable(pixelsort ${SOURCE_FILES} ${LIBPNG_LINK_FLAGS})

src/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,4 @@ int main(int argc, char **argv)
9999

100100
return 0;
101101
}
102+

src/read_write.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <stdlib.h>
55
#include <stdio.h>
6-
#include "png.h"
6+
#include <png.h>
77

88
int width, height;
99
png_byte color_type;

0 commit comments

Comments
 (0)