Skip to content

Commit 1ac6bd2

Browse files
Fixed cmake build for Linux; adding dummy libraries for linux
1 parent a2580f7 commit 1ac6bd2

File tree

9 files changed

+9
-21
lines changed

9 files changed

+9
-21
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Modelica_DeviceDrivers/Resources/src/DummyUser32Library/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ message(STATUS "WRITING BUILD FILES FOR DummyUser32Library")
33

44
set(libSrcsMDDDummyUser32Library MDDDummyUser32Library.c)
55

6-
add_library(User32 SHARED ${libSrcsMDDDummyUser32Library})
6+
add_library(User32 STATIC ${libSrcsMDDDummyUser32Library})
77

88
# install to directory (CMAKE_INSTALL_PREFIX) into subdirectory "lib"
99
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
10-
install(TARGETS rt DESTINATION Library/linux64)
10+
install(TARGETS User32 DESTINATION Library/linux64)
1111
elseif ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
12-
install(TARGETS rt DESTINATION Library/linux32)
12+
install(TARGETS User32 DESTINATION Library/linux32)
1313
else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
1414
message(SEND_ERROR "Uups. Shouldn't be possible to get here")
1515
endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
16-
17-
18-
19-
20-
21-

Modelica_DeviceDrivers/Resources/src/DummyWinmmLibrary/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ message(STATUS "WRITING BUILD FILES FOR DummyWinmmLibrary")
33

44
set(libSrcsMDDDummyWinmmLibrary MDDDummyWinmmLibrary.c)
55

6-
add_library(Winmm SHARED ${libSrcsMDDDummyWinmmLibrary})
6+
add_library(Winmm STATIC ${libSrcsMDDDummyWinmmLibrary})
77

88
# install to directory (CMAKE_INSTALL_PREFIX) into subdirectory "lib"
99
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
10-
install(TARGETS rt DESTINATION Library/linux64)
10+
install(TARGETS Winmm DESTINATION Library/linux64)
1111
elseif ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
12-
install(TARGETS rt DESTINATION Library/linux32)
12+
install(TARGETS Winmm DESTINATION Library/linux32)
1313
else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
1414
message(SEND_ERROR "Uups. Shouldn't be possible to get here")
1515
endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )

Modelica_DeviceDrivers/Resources/src/DummyWs2_32Library/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ message(STATUS "WRITING BUILD FILES FOR DummyWs2_32Library")
33

44
set(libSrcsMDDDummyWs2_32Library MDDDummyWs2_32Library.c)
55

6-
add_library(Ws2_32 SHARED ${libSrcsMDDDummyWs2_32Library})
6+
add_library(Ws2_32 STATIC ${libSrcsMDDDummyWs2_32Library})
77

88
# install to directory (CMAKE_INSTALL_PREFIX) into subdirectory "lib"
99
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
10-
install(TARGETS rt DESTINATION Library/linux64)
10+
install(TARGETS Ws2_32 DESTINATION Library/linux64)
1111
elseif ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
12-
install(TARGETS rt DESTINATION Library/linux32)
12+
install(TARGETS Ws2_32 DESTINATION Library/linux32)
1313
else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
1414
message(SEND_ERROR "Uups. Shouldn't be possible to get here")
1515
endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
16-
17-
18-
19-
20-
21-

0 commit comments

Comments
 (0)