diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-11 13:30:24 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-11 13:30:24 +0200 |
| commit | 8779a6da3912177061fa293a596c1a2e7f511eb5 (patch) | |
| tree | 8402887003be84b880c10dda72c2efc3f97e6075 | |
| parent | Merge pull request #127 from fluffypony/master (diff) | |
| parent | fixed UPNP_LIBRARIES scope (diff) | |
| download | monero-8779a6da3912177061fa293a596c1a2e7f511eb5.tar.xz | |
Merge pull request #128 from fluffypony/master
fixed UPNP_LIBRARIES scope
| -rwxr-xr-x | external/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index bc98d1a1f..fd8cd4eb7 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -200,7 +200,11 @@ IF(MINIUPNPC_VERSION_PRE1_7) ENDIF() IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) - message(STATUS "Found miniupnpc version is v1.7 or higher") + IF(MINIUPNPC_VERSION_1_5_OR_HIGHER) + message(STATUS "Found miniupnpc version is v1.5 or higher") + ELSE() + message(STATUS "Found miniupnpc version is v1.7 or higher") + ENDIF() ENDIF() else () @@ -234,5 +238,5 @@ else() endif() set(UPNP_STATIC true PARENT_SCOPE) - set(UPNP_LIBRARIES "upnpc-static") + set(UPNP_LIBRARIES "upnpc-static" PARENT_SCOPE) endif() |