cmake:zlib: correct link dir. progress with ninja

cburstedde · Nov 1, 2023 · 5480520 · 5480520
1 parent 1f3e46a
commit 5480520
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
@@ -12,7 +12,7 @@ set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
 
 if(BUILD_SHARED_LIBS)
   if(WIN32)
-    set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX})
   else()
     set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
@@ -42,6 +42,11 @@ BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
 TLS_VERIFY true
 CONFIGURE_HANDLED_BY_BUILD ON
 INACTIVITY_TIMEOUT 60
+USES_TERMINAL_DOWNLOAD true
+USES_TERMINAL_UPDATE true
+USES_TERMINAL_BUILD true
+USES_TERMINAL_INSTALL true
+USES_TERMINAL_TEST true
 )