MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no lib prefix for libzip on windows too

develop
Myk Taylor 2020-08-09 04:03:04 -07:00
parent 7a0853025a
commit 5fc627a16f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
depends/CMakeLists.txt
Unescape Escape View File

@ -35,11 +35,11 @@ endforeach()
if(WIN32) if(WIN32)
set(EXPAT_LIB_SUFFIX "MD.lib") set(EXPAT_LIB_SUFFIX "MD.lib")
set(LIB_SUFFIX ".lib") set(LIB_SUFFIX ".lib")
set(XLSXIO_LIB_PREFIX "") set(LIB_PREFIX "")
else() else()
set(EXPAT_LIB_SUFFIX ".a") set(EXPAT_LIB_SUFFIX ".a")
set(LIB_SUFFIX ".a") set(LIB_SUFFIX ".a")
set(XLSXIO_LIB_PREFIX "lib") set(LIB_PREFIX "lib")
endif() endif()
set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat) 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_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) set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
ExternalProject_Add(libzip_project ExternalProject_Add(libzip_project
PREFIX libzip PREFIX libzip
@ -66,7 +66,7 @@ ExternalProject_Add(libzip_project
set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio) set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE) 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) set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
ExternalProject_Add(xlsxio_project ExternalProject_Add(xlsxio_project
PREFIX xlsxio PREFIX xlsxio