Skip to content

Commit f61322a

Browse files
committed
Find LuaJIT/zlib DLLs correctly in clean builds
1 parent 64abde8 commit f61322a

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,11 @@ install(TARGETS SimpleGraphic RUNTIME DESTINATION ".")
194194
if (WIN32)
195195
if (DEFINED ENV{DEPS_DIR})
196196
set(DEPS_BIN_DIR ${DEPS_DIR}/bin)
197-
endif ()
198-
find_file(LUAJIT_DLL NAMES "lua51.dll" PATHS "${CMAKE_BINARY_DIR}" ${DEPS_BIN_DIR} REQUIRED)
199-
find_file(ZLIB_DLL NAMES "zlib1.dll" PATHS "${CMAKE_BINARY_DIR}" ${DEPS_BIN_DIR} REQUIRED)
197+
else ()
198+
set(DEPS_BIN_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
199+
endif ()
200+
find_file(LUAJIT_DLL NAMES "lua51.dll" PATHS "${DEPS_BIN_DIR}" REQUIRED)
201+
find_file(ZLIB_DLL NAMES "zlib1.dll" PATHS "${DEPS_BIN_DIR}" REQUIRED)
200202
install(FILES ${LUAJIT_DLL} ${ZLIB_DLL} DESTINATION ".")
201203
endif ()
202204

0 commit comments

Comments
 (0)