From 03658bff3d73ef5bb4fb6ca69c87b205563a762e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 4 Feb 2015 11:44:53 +0100 Subject: build: don't use pkg-config --- src/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8815881..f433bd4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${ZLIB_INCLUDE_DIRS} ${LIBPNG_INCLUDE_DIRS}) -link_directories(${ZLIB_LIBRARY_DIRS} ${LIBPNG_LIBRARY_DIRS}) +include_directories(${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) +add_definitions(${PNG_DEFINITIONS}) add_executable(MinedMap MinedMap.cpp @@ -15,6 +15,5 @@ add_executable(MinedMap World/Level.cpp World/Region.cpp ) -set_target_properties(MinedMap PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall ${ZLIB_CFLAGS_OTHER} ${LIBPNG_CFLAGS_OTHER}") -set_target_properties(MinedMap PROPERTIES LINK_FLAGS "${ZLIB_LDFLAGS_OTHER} ${LIBPNG_LDFLAGS_OTHER}") -target_link_libraries(MinedMap ${ZLIB_LIBRARIES} ${LIBPNG_LIBRARIES}) +set_target_properties(MinedMap PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall") +target_link_libraries(MinedMap ${ZLIB_LIBRARIES} ${PNG_LIBRARIES}) -- cgit v1.2.3