[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: cmake: fix to make FindPortaudio com
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: cmake: fix to make FindPortaudio compatible with CMake 2.6. |
Date: |
Thu, 24 Jul 2014 17:09:12 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit b9943c093d25a920b08594223b362bb4a1bd5881
Author: Michael Dickens <address@hidden>
Date: Wed Jul 23 14:53:18 2014 -0400
cmake: fix to make FindPortaudio compatible with CMake 2.6.
---
cmake/Modules/FindPortaudio.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/Modules/FindPortaudio.cmake
b/cmake/Modules/FindPortaudio.cmake
index 20145ea..8aa17d4 100644
--- a/cmake/Modules/FindPortaudio.cmake
+++ b/cmake/Modules/FindPortaudio.cmake
@@ -34,13 +34,13 @@ mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
# Found PORTAUDIO, but it may be version 18 which is not acceptable.
if(EXISTS ${PORTAUDIO_INCLUDE_DIRS}/portaudio.h)
include(CheckCXXSourceCompiles)
- include(CMakePushCheckState)
- cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES_SAVED ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_INCLUDES ${PORTAUDIO_INCLUDE_DIRS})
CHECK_CXX_SOURCE_COMPILES(
"#include <portaudio.h>\nPaDeviceIndex pa_find_device_by_name(const char
*name); int main () {return 0;}"
PORTAUDIO2_FOUND)
- cmake_pop_check_state()
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVED})
+ unset(CMAKE_REQUIRED_INCLUDES_SAVED)
if(PORTAUDIO2_FOUND)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG
PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)