git-svn-id: svn://db.shs.com.ru/pip@347 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2017-04-13 08:17:42 +00:00
parent 8dcee8b1be
commit 631e0d4c3f
2 changed files with 11 additions and 3 deletions

View File

@@ -153,7 +153,7 @@ if (FFTW)
if (WIN32) if (WIN32)
list(APPEND LIBS fftw3-3 fftw3f-3 fftw3l-3) list(APPEND LIBS fftw3-3 fftw3f-3 fftw3l-3)
else () else ()
list(APPEND LIBS fftw3 fftw3f) list(APPEND LIBS fftw3 fftw3f fftw3_threads fftw3f_threads)
endif () endif ()
else () else ()
message(STATUS "Building without fftw3 support") message(STATUS "Building without fftw3 support")
@@ -231,7 +231,11 @@ if (LIB)
install(TARGETS pip DESTINATION ${MINGW_BIN}) install(TARGETS pip DESTINATION ${MINGW_BIN})
endif () endif ()
else () 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(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
install(TARGETS pip DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS pip DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif () endif ()

View File

@@ -31,7 +31,11 @@
# if defined(QNX) || defined(BLACKBERRY) # if defined(QNX) || defined(BLACKBERRY)
# include <unix.h> # include <unix.h>
# else # else
# include <pty.h> # ifdef MAC_OS
# include <util.h>
# else
# include <pty.h>
# endif
# endif # endif
#endif #endif