git-svn-id: svn://db.shs.com.ru/pip@335 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

CMakeLists.txt

@@ -52,10 +52,13 @@ include_directories("src")
 foreach(F ${PIP_FOLDERS})
 	include_directories("src/${F}")
 	file(GLOB HS "src/${F}/*.h")
+	file(GLOB PHS "src/${F}/*_p.h")
 	file(GLOB CS "src/${F}/*.cpp")
 	list(APPEND HDRS ${HS})
+	list(APPEND PHDRS ${PHS})
 	list(APPEND CPPS ${CS})
 endforeach(F)
+list(REMOVE_ITEM HDRS ${PHDRS})
 
 # Check Bessel functions
 set(CMAKE_REQUIRED_INCLUDES math.h)
@@ -150,7 +153,7 @@ if (FFTW)
 	if (WIN32)
 		list(APPEND LIBS fftw3-3 fftw3f-3 fftw3l-3)
 	else ()
-		list(APPEND LIBS fftw3 fftw3f fftw3l)
+		list(APPEND LIBS fftw3 fftw3f)
 	endif ()
 else ()
 	message(STATUS "Building without fftw3 support")
@@ -183,7 +186,7 @@ if (WIN32)
 	list(APPEND LIBS ws2_32 iphlpapi psapi)
 	list(APPEND CPPS "pip_resource_win.rc")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPSAPI_VERSION=1")
-	add_library(pip SHARED ${CPPS} ${HDRS})
+	add_library(pip SHARED ${CPPS} ${HDRS} ${PHDRS})
 	if (${CMAKE_C_COMPILER} STREQUAL "cl")
 		include(GenerateExportHeader)
 		generate_export_header(pip)