From f1c937a1437d5706abf8cdf668d80b7c50c00679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Mon, 29 Dec 2014 00:04:11 +0100 Subject: [PATCH] win32: Only use the HAVE_NATUPNP_H cmake variable for the system header CMake remembers the variable in subsequent runs, so setting it to true if the copy from thirdparty/natupnp needs to be used will prevent that copy from being used after a rerun of cmake. --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8d2328fe..c6517d383 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -583,6 +583,7 @@ else() endif() if(WIN32) list(APPEND OC_SYSTEM_SOURCES + src/network/C4Network2UPnPWin32.cpp src/platform/C4CrashHandlerWin32.cpp src/res/engine.rc src/res/resource.h @@ -759,7 +760,6 @@ endif() CHECK_INCLUDE_FILE_CXX(natupnp.h HAVE_NATUPNP_H) if(WIN32 AND NOT HAVE_NATUPNP_H) include_directories(thirdparty/natupnp) - set(HAVE_NATUPNP_H TRUE CACHE BOOL "natupnp.h available" FORCE) endif() CHECK_INCLUDE_FILES_CXX("X11/Xlib.h;X11/extensions/Xrandr.h" HAVE_X11_EXTENSIONS_XRANDR_H) CHECK_INCLUDE_FILES_CXX("X11/Xlib.h;X11/keysym.h" HAVE_X11_KEYSYM_H) @@ -826,11 +826,7 @@ if(HAVE_EXECINFO_H) endif() endif() -if(HAVE_NATUPNP_H) - list(APPEND OC_SYSTEM_SOURCES - src/network/C4Network2UPnPWin32.cpp - ) -else() +if(NOT WIN32) FIND_PACKAGE(Upnp) SET(HAVE_UPNP ${UPNP_FOUND}) if(UPNP_FOUND)