neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-05 01:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: don't use pkg-config

Browse source
This commit is contained in:
Matthias Schiffer 2015-02-04 11:44:53 +01:00
parent 7b5327f828
commit 03658bff3d
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -2,9 +2,8 @@ cmake_minimum_required(VERSION 2.8.4)
project(MINEDMAP CXX) project(MINEDMAP CXX)
find_package(PkgConfig REQUIRED) find_package(PNG REQUIRED)
pkg_check_modules(LIBPNG REQUIRED libpng>=1.2) find_package(ZLIB REQUIRED)
pkg_check_modules(ZLIB REQUIRED zlib)
add_subdirectory(src) add_subdirectory(src)

9
src/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${ZLIB_INCLUDE_DIRS} ${LIBPNG_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS})
link_directories(${ZLIB_LIBRARY_DIRS} ${LIBPNG_LIBRARY_DIRS}) add_definitions(${PNG_DEFINITIONS})
add_executable(MinedMap add_executable(MinedMap
MinedMap.cpp MinedMap.cpp
@ -15,6 +15,5 @@ add_executable(MinedMap
World/Level.cpp World/Level.cpp
World/Region.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 COMPILE_FLAGS "-std=c++11 -Wall")
set_target_properties(MinedMap PROPERTIES LINK_FLAGS "${ZLIB_LDFLAGS_OTHER} ${LIBPNG_LDFLAGS_OTHER}") target_link_libraries(MinedMap ${ZLIB_LIBRARIES} ${PNG_LIBRARIES})
target_link_libraries(MinedMap ${ZLIB_LIBRARIES} ${LIBPNG_LIBRARIES})