Merge pull request #429 from VergLsm/2.8-stable

fix(win): "config.h: No such file or directory"
This commit is contained in:
Luca Deri 2020-09-20 18:31:27 +02:00 committed by GitHub
commit 99e56e9f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@ include(CheckFunctionExists)
SET(CMAKE_VERBOSE_MAKEFILE ON) SET(CMAKE_VERBOSE_MAKEFILE ON)
# N2n release information # N2n release information
set(N2N_VERSION "2.7.0") set(N2N_VERSION "2.8.0")
set(N2N_OSNAME ${CMAKE_SYSTEM}) set(N2N_OSNAME ${CMAKE_SYSTEM})
execute_process( execute_process(
COMMAND git --version COMMAND git --version

View File

@ -38,7 +38,7 @@
#ifdef WIN32 #ifdef WIN32
#include "win32/n2n_win32.h" #include "win32/n2n_win32.h"
#ifdef _MSC_VER #ifndef CMAKE_BUILD
#include "config.h" /* Visual C++ */ #include "config.h" /* Visual C++ */
#else #else
#include "win32/winconfig.h" #include "win32/winconfig.h"