cmake build support for mingw32

Author: bernhard-thiele

Modelica_DeviceDrivers/Communication/UDPSocket.mo

@@ -10,7 +10,7 @@ encapsulated function constructor
 external "C" socket = MDD_udpConstructor(port,bufferSize)
 annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
            Include = "#include \"MDDUDPSocket.h\" ",
-           Library = "pthread",
+           Library = {"pthread", "Ws2_32"},
            __iti_dll = "ITI_MDD.dll");
 end constructor;
 
@@ -20,7 +20,7 @@ encapsulated function destructor
 external "C" MDD_udpDestructor(socket)
 annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
            Include = "#include \"MDDUDPSocket.h\" ",
-           Library = "pthread",
+           Library = {"pthread", "Ws2_32"},
            __iti_dll = "ITI_MDD.dll");
 end destructor;
 

Modelica_DeviceDrivers/Communication/UDPSocket_.mo

@@ -8,7 +8,7 @@ output String data;
 external "C" data = MDD_udpRead(socket)
 annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
            Include = "#include \"MDDUDPSocket.h\" ",
-           Library = "pthread",
+           Library = {"pthread", "Ws2_32"},
            __iti_dll = "ITI_MDD.dll");
 end read;
 
@@ -22,7 +22,7 @@ encapsulated function sendTo
 external "C" MDD_udpSend(socket, ipAddress, port, data, dataSize)
 annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
            Include = "#include \"MDDUDPSocket.h\" ",
-           Library = "pthread",
+           Library = {"pthread", "Ws2_32"},
            __iti_dll = "ITI_MDD.dll");
 end sendTo;
 
@@ -33,7 +33,7 @@ encapsulated function getReceivedBytes
   external "C" receivedBytes =  MDD_udpGetReceivedBytes(socket)
   annotation(IncludeDirectory="modelica://Modelica_DeviceDrivers/Resources/Include",
            Include = "#include \"MDDUDPSocket.h\" ",
-           Library = "pthread",
+           Library = {"pthread", "Ws2_32"},
            __iti_dll = "ITI_MDD.dll");
 end getReceivedBytes;
 end UDPSocket_;

Modelica_DeviceDrivers/Resources/CMakeLists.txt

@@ -35,6 +35,8 @@ if (UNIX)
   add_subdirectory(src/DummyWinmmLibrary)
   # Dummy Linux User32 library for uniform treatment of GCC and MS Visual C within Modelica
   add_subdirectory(src/DummyUser32Library)
+  # Dummy Linux Ws2_32 library for uniform treatment of GCC and MS Visual C within Modelica
+  add_subdirectory(src/DummyWs2_32Library)
   # Are we trying to force compilation for linux32 on a native linux64 platform?
   if ( ($ENV{CFLAGS} MATCHES "-m32") AND ($ENV{CXXFLAGS} MATCHES "-m32") )
     set(M32_FLAG TRUE)

Modelica_DeviceDrivers/Resources/Include/MDDUDPSocket.h

@@ -21,13 +21,11 @@
 
 #include "ModelicaUtilities.h"
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
 
 #include <windows.h>
 #include "../src/include/CompatibilityDefs.h"
 
-#pragma comment( lib, "Ws2_32.lib" )
-
 typedef struct MDDUDPSocket_s MDDUDPSocket;
 
 struct MDDUDPSocket_s {
@@ -187,7 +185,7 @@ DllExport int MDD_udpGetReceivedBytes(void * p_udp) {
     return receivedBytes;
 }
 
-#elif defined(__linux__) || defined(__CYGWIN__)
+#elif defined(__linux__)
 
 #include <stdlib.h>
 #include <string.h> /* memset(..) */

Modelica_DeviceDrivers/Resources/src/DummyWs2_32Library/CMakeLists.txt

@@ -0,0 +1,21 @@
+message(STATUS "WRITING BUILD FILES FOR DummyWs2_32Library")
+#message(STATUS "${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}")
+
+set(libSrcsMDDDummyWs2_32Library MDDDummyWs2_32Library.c)
+
+add_library(Ws2_32 SHARED ${libSrcsMDDDummyWs2_32Library})
+
+# install to directory (CMAKE_INSTALL_PREFIX) into subdirectory "lib"
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  install(TARGETS rt DESTINATION Library/linux64)
+elseif ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+  install(TARGETS rt DESTINATION Library/linux32)
+else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  message(SEND_ERROR "Uups. Shouldn't be possible to get here")
+endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
+
+
+
+
+

Modelica_DeviceDrivers/Resources/src/DummyWs2_32Library/MDDDummyWs2_32Library.c

@@ -0,0 +1,18 @@
+/** Dummy library for uniform treatment of Modelica external function in windows and linux.
+ *
+ * @file
+ * @author		Bernhard Thiele
+ * @since		2015-04-18
+ * @copyright Modelica License 2
+ * For windows, various functions need to link the User32.lib library.
+ * However, Linux neither provides nor requires this library for the implemented functions.
+ *
+ * - <B>The problem</B>: We need to specify in Modelica to link the User32.lib library if running on Windows, but
+ *   it is not needed for Linux (and results in a linking error if specified in the
+ *   annotation).
+ * - <B>The workaround</B>: We provide a dummy libUser32.a library for Linux, so that linking won't result in an
+ *   error. This is not nice for several reasons and good suggestions how to solve that
+ *   differently are welcome.
+*/
+
+static void MDD_dummy(void);

Modelica_DeviceDrivers/Resources/src/DummyWs2_32Library/Readme.txt

@@ -0,0 +1 @@
+Dummy library for Linux.

Modelica_DeviceDrivers/Resources/src/ITI_ModelicaDeviceDrivers/CMakeLists.txt

@@ -19,7 +19,7 @@ else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 
 add_library(ITI_MDD SHARED ${libSrcsITI_MDDLibrary})
-target_link_libraries(ITI_MDD ${MODELICA_EXTERNAL_C})
+target_link_libraries(ITI_MDD Winmm Ws2_32 ${MODELICA_EXTERNAL_C})
 
 if ( CANL2_LIBRARY )
 	add_library(ITI_MDDSoftingCAN SHARED ${libSrcsITI_MDDSoftingCANLibrary})

Modelica_DeviceDrivers/Resources/test/Communication/CMakeLists.txt

@@ -16,6 +16,9 @@ endif (UNIX)
 add_executable(test_MDDUDPSocket test_MDDUDPSocket.c ../Util/ModelicaUtilities.c)
 if (UNIX)
   target_link_libraries(test_MDDUDPSocket ${CMAKE_THREAD_LIBS_INIT})
+else (UNIX)
+  # assume we are in windows
+  target_link_libraries(test_MDDUDPSocket Ws2_32)
 endif (UNIX)
 add_test(test_MDDUDPSocket 
 	${EXECUTABLE_OUTPUT_PATH}/test_MDDUDPSocket)
@@ -30,10 +33,8 @@ add_test(test_MDDSerialPackager
 
 add_executable(test_MDDSharedMemory
   test_MDDSharedMemory.c ../Util/ModelicaUtilities.c)
-if (NOT MSVC)
-  target_link_libraries(test_MDDSharedMemory rt)
-endif (NOT MSVC)
 if (UNIX)
+  target_link_libraries(test_MDDSharedMemory rt)
   target_link_libraries(test_MDDSharedMemory ${CMAKE_THREAD_LIBS_INIT})
 endif (UNIX)
 add_test(test_MDDSharedMemory