x64 and x86 test

CMakeLists.txt

@@ -12,5 +12,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${TASKBUS_BIN_DIR})
 option(TB_PLUTO "Turn on pluto SDR project" ON)
 option(TB_UHD "Turn on Ettus USRP SDR project" ON)
 
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+    set(TB64BIT True )
+else()
+    set(TB64BIT False )
+endif()
+
 add_subdirectory(taskbusplatform)
 add_subdirectory(modules)
+
+

modules/sinks/sink_plutosdr/CMakeLists.txt

@@ -20,25 +20,29 @@ set(PRJ_SOURCES
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     include_directories(${TASKBUS_THIRDIR}/win32/libiio/include)
     if(MSVC)
-	if(CMAKE_CL_64)
-	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS32)
-	else(CMAKE_CL_64)
+	set(IIO_LIB iio)
+	if(TB64BIT)
 	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS64)
-	endif(CMAKE_CL_64)
-    else(MSVC)
-	if(CMAKE_CL_64)
-	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW32)
-	else(CMAKE_CL_64)
+	else()
+	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS32)
+	endif()
+    else()
+	set(IIO_LIB iio.dll)
+	if(TB64BIT)
 	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW64)
-	endif(CMAKE_CL_64)
-    endif(MSVC)
-endif(CMAKE_SYSTEM_NAME)
+	else()
+	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW32)
+	endif()
+    endif()
+else()
+    set(IIO_LIB iio)
+endif()
 #############Target======================
 
 add_executable(sink_plutosdr
     ${PRJ_SOURCES}
 )
 target_link_libraries(sink_plutosdr
-    iio
+    ${IIO_LIB}
     Qt${QT_VERSION_MAJOR}::Core)
 

modules/sources/source_plutosdr/CMakeLists.txt

@@ -16,23 +16,26 @@ set(PRJ_SOURCES
     listen_thread.cpp
     main.cpp
 )
-
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     include_directories(${TASKBUS_THIRDIR}/win32/libiio/include)
     if(MSVC)
-	if(CMAKE_CL_64)
-	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS32)
-	else(CMAKE_CL_64)
+	set(IIO_LIB iio)
+	if(TB64BIT)
 	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS64)
-	endif(CMAKE_CL_64)
+	else()
+	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MS32)
+	endif()
     else(MSVC)
-	if(CMAKE_CL_64)
-	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW32)
-	else(CMAKE_CL_64)
+	set(IIO_LIB iio.dll)
+	if(TB64BIT)
 	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW64)
-	endif(CMAKE_CL_64)
-    endif(MSVC)
-endif(CMAKE_SYSTEM_NAME)
+	else()
+	    link_directories(${TASKBUS_THIRDIR}/win32/libiio/MinGW32)
+	endif()
+    endif()
+else()
+    set(IIO_LIB iio)
+endif()
 
 #############Target======================
 
@@ -40,6 +43,6 @@ add_executable(source_plutosdr
     ${PRJ_SOURCES}
 )
 target_link_libraries(source_plutosdr
-    iio
+    ${IIO_LIB}
     Qt${QT_VERSION_MAJOR}::Core)
 

modules/transforms/transform_fft/CMakeLists.txt

@@ -19,19 +19,19 @@ set(PRJ_SOURCES
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     if(MSVC)
 	include_directories(${TASKBUS_THIRDIR}/win32/fftw)
-	if(CMAKE_CL_64)
-	    link_directories(${TASKBUS_THIRDIR}/win32/fftw/x86)
-	    set (FFT_LIB fftw3-3)
-	else(CMAKE_CL_64)
+	if(TB64BIT)
 	    link_directories(${TASKBUS_THIRDIR}/win32/fftw/x64)
 	    set (FFT_LIB fftw3-3)
-	endif(CMAKE_CL_64)
-    else(MSVC)
+	else()
+	    link_directories(${TASKBUS_THIRDIR}/win32/fftw/x32)
+	    set (FFT_LIB fftw3-3)
+	endif()
+    else()
 	set (FFT_LIB fftw3)
-    endif(MSVC)
-else(CMAKE_SYSTEM_NAME)
+    endif()
+else()
     set (FFT_LIB fftw3)
-endif(CMAKE_SYSTEM_NAME)
+endif()
 #############Target======================
 
 add_executable(transform_fft