From 37efa253780c6464bca2485679fa2cd9f75c46c2 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sun, 12 Nov 2023 21:48:24 +0100 Subject: [PATCH] fix stupid double quotes --- cmake/libzip.cmake | 6 +++--- cmake/zlib.cmake | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/libzip.cmake b/cmake/libzip.cmake index a838098..d25294e 100644 --- a/cmake/libzip.cmake +++ b/cmake/libzip.cmake @@ -14,13 +14,13 @@ if (libzip_POPULATED) endif() FetchContent_Populate(libzip) -if(EXISTS ${libzip_SOURCE_DIR}) +if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zip.lib) message(STATUS "Skipping libzip build") return() endif() execute_process( - COMMAND ${CMAKE_COMMAND} -A Win32 -DZLIB_LIBRARY:PATH="${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib" -DZLIB_INCLUDE_DIR:PATH="${CMAKE_INSTALL_PREFIX}/include" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} . + COMMAND ${CMAKE_COMMAND} -A Win32 -DZLIB_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib -DZLIB_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} . WORKING_DIRECTORY ${libzip_SOURCE_DIR} ) execute_process( @@ -32,4 +32,4 @@ execute_process( WORKING_DIRECTORY ${libzip_SOURCE_DIR} ) -message(STATUS "Finished libzip build") \ No newline at end of file +message(STATUS "Finished libzip build") diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 7129bd1..9f91549 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -20,7 +20,7 @@ endif() FetchContent_Populate(zlib) -if(EXISTS ${zlib_SOURCE_DIR}) +if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib) message(STATUS "Skipping zlib build") return() endif() @@ -39,4 +39,4 @@ execute_process( WORKING_DIRECTORY ${zlib_SOURCE_DIR} ) -message(STATUS "Finished zlib build") \ No newline at end of file +message(STATUS "Finished zlib build")