Merge branch 'master' into 'master'

Master

See merge request !1

parallel_worlds_0/src/CMakeLists.txt

@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
 endif( MSVC )
 
 if( UNIX )
 	message( "UNIX-like system: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
 endif( UNIX )
 
 find_package( OpenCV REQUIRED )

parallel_worlds_1/src/CMakeLists.txt

@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
 endif( MSVC )
 
 if( UNIX )
 	message( "UNIX-like system: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
 endif( UNIX )
 
 find_package( OpenCV REQUIRED )

parallel_worlds_1/src/DeviceInterface.hpp

@@ -82,7 +82,7 @@ private:
 	}
 
 	void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
-		devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+		devices = findDevices(requestedDevice);
 		// In order to execute a kernel (OpenCL program), it is necessary to first define
 		// some hardware presentations:
 		// 1. a context that defines the devices (and thus the usable binary code)

parallel_worlds_2/src/CMakeLists.txt

@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
 endif( MSVC )
 
 if( UNIX )
 	message( "UNIX-like system: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
 endif( UNIX )
 
 find_package( OpenCV REQUIRED )

parallel_worlds_2/src/DeviceInterface.hpp

@@ -82,7 +82,7 @@ private:
 	}
 
 	void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
-		devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+		devices = findDevices(requestedDevice);
 		// In order to execute a kernel (OpenCL program), it is necessary to first define
 		// some hardware presentations:
 		// 1. a context that defines the devices (and thus the usable binary code)

parallel_worlds_3/src/CMakeLists.txt

@@ -5,12 +5,12 @@ set( EXECUTABLE ${PROJECT_NAME} )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /arch:SSE2 /I.")
 endif( MSVC )
 
 if( UNIX )
 	message( "UNIX-like system: adding compiler flags" )
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -I.")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -msse2 -I.")
 endif( UNIX )
 
 find_package( OpenCV REQUIRED )

parallel_worlds_3/src/DeviceInterface.hpp

@@ -82,7 +82,7 @@ private:
 	}
 
 	void init(cl_device_type requestedDevice=CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR) {
-		devices = findDevices(CL_DEVICE_TYPE_GPU | CL_DEVICE_TYPE_ACCELERATOR);
+		devices = findDevices(requestedDevice);
 		// In order to execute a kernel (OpenCL program), it is necessary to first define
 		// some hardware presentations:
 		// 1. a context that defines the devices (and thus the usable binary code)