Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use pdcurses from vcpkg if available

This commit is contained in:
Enno Rehling 2021-02-13 12:10:47 +01:00
parent ebc8c3f1d2
commit ba3b9ae6d3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -11,7 +11,7 @@ if (MSVC)
find_package (PDCurses) find_package (PDCurses)
set (CURSES_FOUND ${PDCURSES_FOUND}) set (CURSES_FOUND ${PDCURSES_FOUND})
set (CURSES_LIBRARIES ${PDCURSES_LIBRARY}) set (CURSES_LIBRARIES ${PDCURSES_LIBRARY})
set (CURSES_INCLUDE_DIR ${PDCURSES_INCLUDE_DIR}) set (CURSES_INCLUDE_DIRS ${PDCURSES_INCLUDE_DIR})
set (HAVE_STRDUP 0) set (HAVE_STRDUP 0)
set (HAVE_STRLCAT 0) set (HAVE_STRLCAT 0)
set (HAVE_LIBBSD 0) set (HAVE_LIBBSD 0)
@ -20,7 +20,6 @@ set (HAVE_EXECINFO_H 0)
include (MSVC) include (MSVC)
else (MSVC) else (MSVC)
find_package (Curses)
include (CheckIncludeFile) include (CheckIncludeFile)
CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H) CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H)
CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H) CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H)
@ -36,6 +35,10 @@ CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
endif (HAVE_LIBBSD) endif (HAVE_LIBBSD)
endif (MSVC) endif (MSVC)
if (NOT CURSES_FOUND)
find_package (Curses)
endif (NOT CURSES_FOUND)
find_package (SQLite3 REQUIRED) find_package (SQLite3 REQUIRED)
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)

2
vs2019-build.bat
View File

@ -8,7 +8,7 @@ REM CD ..
REM SET ERESSEA=%CD% REM SET ERESSEA=%CD%
REM CD %SRCDIR% REM CD %SRCDIR%
SET CMAKE_MODULES="%CMAKE_ROOT%\share\cmake-3.19\Modules;%SRCDIR%\cmake\Modules" SET CMAKE_MODULES="%CMAKE_ROOT%\share\cmake-3.19\Modules"
IF exist build-vs%VSVERSION% goto HAVEDIR IF exist build-vs%VSVERSION% goto HAVEDIR
mkdir build-vs%VSVERSION% mkdir build-vs%VSVERSION%