From 5fc627a16f26c7acae4d0bf8b858066440afa9d1 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 9 Aug 2020 04:03:04 -0700 Subject: [PATCH] no lib prefix for libzip on windows too --- depends/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index db132a809..bb5dc72dc 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -35,11 +35,11 @@ endforeach() if(WIN32) set(EXPAT_LIB_SUFFIX "MD.lib") set(LIB_SUFFIX ".lib") - set(XLSXIO_LIB_PREFIX "") + set(LIB_PREFIX "") else() set(EXPAT_LIB_SUFFIX ".a") set(LIB_SUFFIX ".a") - set(XLSXIO_LIB_PREFIX "lib") + set(LIB_PREFIX "lib") endif() set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat) @@ -54,7 +54,7 @@ ExternalProject_Add(libexpat_project ) set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip) -set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX}) +set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${LIB_PREFIX}zip${LIB_SUFFIX}) set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE) ExternalProject_Add(libzip_project PREFIX libzip @@ -66,7 +66,7 @@ ExternalProject_Add(libzip_project set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio) set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE) -set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${XLSXIO_LIB_PREFIX}xlsxio_read${LIB_SUFFIX}) +set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${LIB_PREFIX}xlsxio_read${LIB_SUFFIX}) set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE) ExternalProject_Add(xlsxio_project PREFIX xlsxio