Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add compatibility to vcpkg buildsystem #8317

Merged
merged 11 commits into from
Jun 10, 2019
Merged

Add compatibility to vcpkg buildsystem #8317

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4de6675
Make FindCURL ready for vcpkg
adrido Feb 27, 2019
5a4e602
Find leveldb.lib with vcpkg buildsystem
adrido Mar 1, 2019
6324685
Freetype is already found using find_package
adrido Mar 1, 2019
fff7c50
Properly find zlib
adrido Mar 1, 2019
c6ded89
Handle the dlls when using vcpkg toolchain
adrido Mar 1, 2019
0771203
Find Irrlicht on vcpkg
adrido Mar 1, 2019
aa5d519
Document how to build on windows using vcpkg
adrido Mar 2, 2019
2aa45be
Find Luajit on vcpkg
adrido Mar 2, 2019
6808814
Remove zlibwapi
adrido Mar 10, 2019
59c1263
Apply suggestions from code review
ClobberXD Apr 19, 2019
cd26ca8
Update README.md
adrido Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Properly find zlib
  • Loading branch information
@adrido
adrido authored and unknown committed Apr 19, 2019
commit fff7c5080123ef5905123acfb9be6c2070a986ab
10 changes: 3 additions & 7 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,9 @@ if(WIN32)
set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})

# Zlib stuff
set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
CACHE PATH "Zlib include directory")
set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
CACHE FILEPATH "Path to zlib library (usually zlibwapi.lib)")
set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
CACHE FILEPATH "Path to zlib DLL (for installation)")
set(ZLIBWAPI_DLL "" CACHE FILEPATH "Path to zlibwapi DLL")
find_path(ZLIB_INCLUDE_DIR "zlib.h" DOC "Zlib include directory")
find_library(ZLIB_LIBRARIES "zlib" DOC "Path to zlib library")

set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
CACHE PATH "irrlicht dir")

Expand Down