summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <[email protected]>2018-12-11 23:25:10 +0100
committerHannah von Reth <[email protected]>2018-12-11 23:25:10 +0100
commit6214f1cfbee37413820c91bf3911ae1e261a5175 (patch)
tree95137c39f051113283dfb9ebdf1f830a160a832d
parent023fa9b25abbcac19ed747273aae66b21678ba94 (diff)
Properly link to zlib
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/kdbgwin/CMakeLists.txt2
2 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2761281..c73240a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,11 +52,7 @@ if (MINGW)
if (msg)
message(FATAL_ERROR "could not find ${msg}")
endif()
- add_library(z STATIC IMPORTED)
- set_target_properties(z PROPERTIES
- IMPORTED_LOCATION ${ZLIB_LIBRARIES}
- IMPORTED_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS}
- )
+
add_library(intl SHARED IMPORTED)
set_target_properties(intl PROPERTIES
IMPORTED_IMPLIB ${INTL_LIBRARY}
diff --git a/src/kdbgwin/CMakeLists.txt b/src/kdbgwin/CMakeLists.txt
index f504ef3..83ca9a1 100644
--- a/src/kdbgwin/CMakeLists.txt
+++ b/src/kdbgwin/CMakeLists.txt
@@ -18,7 +18,7 @@ set(COMMON_LIBS dbghelp psapi shlwapi)
if ( MINGW )
add_executable(kdbgwin ${kdbgwin_SRCS} mingw_generator.h mingw_generator.cpp)
- target_link_libraries(kdbgwin PRIVATE ${COMMON_LIBS} bfd iberty intl z Qt5::Core)
+ target_link_libraries(kdbgwin PRIVATE ${COMMON_LIBS} bfd iberty intl ZLIB::ZLIB Qt5::Core)
endif ()
if ( MSVC OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
add_executable(kdbgwin ${kdbgwin_SRCS} msvc_generator.h msvc_generator.cpp)