updated CMakeLists.txt to take new pipo folder structure into account

CMakeLists.txt

@@ -33,11 +33,17 @@ include_directories(dependencies/xmm/src)
 include_directories(dependencies/GVF)
 include_directories(dependencies/Maximilian)
 include_directories(dependencies/Maximilian/libs)
-include_directories(dependencies/pipo/src/include)
-include_directories(dependencies/pipo/src/host)
-include_directories(dependencies/pipo/src/modules)
-include_directories(dependencies/pipo/src/dependencies/rta)
-include_directories(dependencies/pipo/src/dependencies/rta/common)
+include_directories(dependencies/pipo/sdk/src)
+include_directories(dependencies/pipo/sdk/src/host)
+include_directories(dependencies/pipo/modules)
+include_directories(dependencies/pipo/modules/collection)
+include_directories(dependencies/pipo/modules/bayesfilter/src)
+include_directories(dependencies/pipo/modules/finitedifferences)
+include_directories(dependencies/pipo/modules/rta/src)
+include_directories(dependencies/pipo/modules/rta/src/util)
+include_directories(dependencies/pipo/modules/rta/src/statistics)
+include_directories(dependencies/pipo/modules/rta/src/signal)
+include_directories(dependencies/pipo/modules/rta/bindings/lib)
 
 # Third party dependencies
 include_directories(dependencies/third_party/json)
@@ -52,7 +58,14 @@ file(GLOB MAXI_SRC ${MAXI_SRC} "${PROJECT_SOURCE_DIR}/dependencies/Maximilian/li
 file(GLOB MAXI_SRC ${MAXI_SRC} "${PROJECT_SOURCE_DIR}/dependencies/Maximilian/libs/fft.cpp")
 
 #PiPofile
-file(GLOB_RECURSE PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/src/*")
+file(GLOB_RECURSE PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/sdk/src/*")
+file(GLOB_RECURSE PIPO_SRC ${PIPO_SRC} "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/*")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/wavelet/*")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/rta/src/physical-models/*")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/rta/src/recognition/*")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/rta/src/signal/rta_onepole.c")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/rta/src/signal/rta_resample.c")
+list(REMOVE_ITEM PIPO_SRC "${PROJECT_SOURCE_DIR}/dependencies/pipo/modules/rta/src/statistics/rta_cca.c")
 
 # RapidLib
 file(GLOB RAPIDLIB_SRC "${PROJECT_SOURCE_DIR}/dependencies/RapidLib/src/*.cpp")
@@ -64,13 +77,13 @@ file(GLOB_RECURSE XMM_SRC "${PROJECT_SOURCE_DIR}/dependencies/xmm/src/*")
 file(GLOB JSON_SRC "${PROJECT_SOURCE_DIR}/dependencies/third_party/jsoncpp.cpp")
 
 # Set the source for the main library, using the groups defined above
-set(RAPIDMIX_FULL_SRC ${RAPIDMIX_SRC} 
-		      ${GVF_SRC} 
+set(RAPIDMIX_FULL_SRC ${RAPIDMIX_SRC}
+		      ${GVF_SRC}
 		      ${MAXI_SRC}
-#		      ${PIPO_SRC} 
-		      ${RAPIDLIB_SRC} 
+#		      ${PIPO_SRC}
+		      ${RAPIDLIB_SRC}
 		      ${RAPIDLIB_DEP}
-		      ${XMM_SRC}	     
+		      ${XMM_SRC}
 		      ${JSON_SRC}
 		      )