Build: Various fixes

- Fixed Find files for ActiChamp and FFTW3
- Changed Mensia Acquisition and Enobio to install all DLLs to bin/
- Updated the .nsi scripts accordingly
- Updated .gitignore

.gitignore

+# The following are automatically generated by the build or dep installer
 local-tmp
 dependencies
 scripts/win32-dependencies.cmd
 dist
 build
+plugins/processing/matlab/share/OV_stimulations.m
+toolkit/include/toolkit/ovtk_stimulations.h
+toolkit/src/ovtk_stimulations.cpp
+# Editor swap files etc ...
 CMakeLists.txt.*
 .*.swp
-externals/*/
 *~
 *.swp
 .project
 .cproject
-
+# Third party stuff
+externals/*/

cmake-modules/FindThirdPartyActiCHampAPI.cmake

@@ -12,7 +12,7 @@
 # Adds include path
 # ---------------------------------
 IF(WIN32)
-	FIND_PATH(PATH_ActiCHampAPI ActiChamp.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH})
+	FIND_PATH(PATH_ActiCHampAPI ActiChamp.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/sdk-brainproducts-actichamp)
 	IF(PATH_ActiCHampAPI)
 		MESSAGE(STATUS "  Found actiCHamp API...")
 		INCLUDE_DIRECTORIES(${PATH_ActiCHampAPI})

cmake-modules/FindThirdPartyFFTW3.cmake

@@ -11,7 +11,13 @@ IF(WIN32)
 	FIND_PATH(PATH_FFTW3 include/fftw3.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/itpp)
 	IF(PATH_FFTW3)
 		SET(FFTW3_FOUND TRUE)
-		SET(FFTW3_LIBRARIES	libfftw3-3)
+		# Of course the name of the library is this or that, depending on the circumstances ...
+		FIND_LIBRARY(FFTW3_TMP NAMES libfftw3-3_win32 PATHS ${PATH_FFTW3}/lib NO_DEFAULT_PATH)
+		IF(FFTW3_TMP)
+			SET(FFTW3_LIBRARIES	libfftw3-3_win32)
+		ELSE(FFTW3_TMP)
+			SET(FFTW3_LIBRARIES	libfftw3-3)
+		ENDIF(FFTW3_TMP)
 		SET(FFTW3_INCLUDE_DIRS ${PATH_FFTW3}/include )
 		SET(FFTW3_LIBRARY_DIRS ${PATH_FFTW3}/lib )	
 	ENDIF(PATH_FFTW3)

cmake-modules/FindThirdPartyMensiaAcquisition.cmake

@@ -6,7 +6,7 @@ ENDIF(WIN32)
 IF(PATH_MENSIA)
 	MESSAGE(STATUS "  Found Mensia Acquisition driver...")
 
-	INSTALL(PROGRAMS "${PATH_MENSIA}/openvibe-driver-mensia-acquisition.dll" DESTINATION "bin")
+	INSTALL(DIRECTORY "${PATH_MENSIA}/" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}/" FILES_MATCHING PATTERN "*.dll")
 	ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyMensiaAcquisition)
 ELSE(PATH_MENSIA)
 	MESSAGE(STATUS "  FAILED to find Mensia Acquisition driver (optional)")

cmake-modules/FindThirdPartyNeuroelectricsEnobio3G.cmake

@@ -21,6 +21,7 @@ IF(WIN32)
 	ENDIF(NOT LIB_ENOBIOAPI)
 	
 	INCLUDE_DIRECTORIES(${PATH_ENOBIOAPI})						
+	INSTALL(DIRECTORY "${PATH_ENOBIOAPI}/../MSVC/" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}/" FILES_MATCHING PATTERN "*.dll")
 	TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_ENOBIOAPI} )
 	ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyEnobioAPI)	
 			

scripts/win32-install_dependencies.nsi

@@ -204,11 +204,6 @@ no_need_to_download_dependencies_runtime:
 	FileWrite $0 "SET PATH=$INSTDIR\libvorbis\win32\bin\release;$INSTDIR\libvorbis\win32\bin\debug;%PATH%$\r$\n"	
 	FileWrite $0 "SET PATH=$INSTDIR\liblsl\lib\;%PATH%$\r$\n"	
 	
-; Driver dependencies
-
-	FileWrite $0 "SET PATH=$INSTDIR\sdk-mensia-acquisition-driver\;%PATH%$\r$\n"
-	FileWrite $0 "SET PATH=$INSTDIR\sdk-enobio3g\MSVC\;%PATH%$\r$\n"	
-		
 	FileClose $0
 	
 ; Package configuration
@@ -287,7 +282,6 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\openal"	
 	RMDir /r "$INSTDIR\pthreads"	
 	RMDir /r "$INSTDIR\vrpn"
-	RMDir /r "$INSTDIR\sdk-*"
 		
 	Delete "$INSTDIR\..\scripts\win32-dependencies.cmd"
 

scripts/win32-openvibe-x.x.x-setup.nsi

@@ -122,7 +122,7 @@ no_need_to_install_directx:
 	ZipDLL::extractall "arch\ov-dependencies-1.2.0-vc120-runtime.zip" ""
 	
 	SetOutPath "$INSTDIR"
-	; Export binaries (except the mensia acquisition dll, it will be installed optionally as part of neurort drivers choice)
+	; Export binaries
 	File /nonfatal /r ..\dist\bin
 	; Export launch scripts
 	File /nonfatal ..\dist\*.cmd
@@ -169,7 +169,6 @@ no_need_to_patch_3d_functionnality:
 	FileWrite $0 "SET PATH=$INSTDIR\dependencies\libvorbis\win32\bin\release;%PATH%$\r$\n"
 	FileWrite $0 "SET PATH=$INSTDIR\dependencies\libogg\win32\bin\release\;%PATH%$\r$\n"
 	FileWrite $0 "SET PATH=$INSTDIR\dependencies\liblsl\lib\;%PATH%$\r$\n"
-	FileWrite $0 "SET PATH=$INSTDIR\dependencies\enobio3g\MSVC\;%PATH%$\r$\n"	
 	FileClose $0
 	
 	FileOpen $0 "$INSTDIR\dependencies\cegui\resources.cfg" w