From 631e0d4c3f6ff42a9d3b8f2161c9e919ac08c429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 13 Apr 2017 08:17:42 +0000 Subject: [PATCH] mac git-svn-id: svn://db.shs.com.ru/pip@347 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 8 ++++++-- src/console/piterminal.cpp | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 983d5d05..e18fc73b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ if (FFTW) if (WIN32) list(APPEND LIBS fftw3-3 fftw3f-3 fftw3l-3) else () - list(APPEND LIBS fftw3 fftw3f) + list(APPEND LIBS fftw3 fftw3f fftw3_threads fftw3f_threads) endif () else () message(STATUS "Building without fftw3 support") @@ -231,7 +231,11 @@ if (LIB) install(TARGETS pip DESTINATION ${MINGW_BIN}) endif () else () - set(CMAKE_INSTALL_PREFIX /usr) + if (APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) install(TARGETS pip DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/src/console/piterminal.cpp b/src/console/piterminal.cpp index 5cbebea0..95136b26 100644 --- a/src/console/piterminal.cpp +++ b/src/console/piterminal.cpp @@ -31,7 +31,11 @@ # if defined(QNX) || defined(BLACKBERRY) # include # else -# include +# ifdef MAC_OS +# include +# else +# include +# endif # endif #endif