-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathdisable_runtime_library_overrides.patch
148 lines (138 loc) · 7.41 KB
/
disable_runtime_library_overrides.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
diff --git a/configure/cmake_win.cmake b/configure/cmake_win.cmake
index 9fdfe8d..2199c22 100644
--- a/configure/cmake_win.cmake
+++ b/configure/cmake_win.cmake
@@ -44,7 +44,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
"${dyn_defs}")
target_compile_options(tangod PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
- target_compile_options(tangod-static PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER} "/MTd")
+ target_compile_options(tangod-static PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
target_link_libraries(tangod PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_DYN} ${ZMQ_PKG_LIBRARIES_DYN} ${PTHREAD_WIN_PKG_LIBRARIES_DYN} ${CMAKE_DL_LIBS})
target_link_libraries(tangod-static PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_STA} ${ZMQ_PKG_LIBRARIES_STA} ${PTHREAD_WIN_PKG_LIBRARIES_STA} ${CMAKE_DL_LIBS})
@@ -101,7 +101,7 @@ else(CMAKE_BUILD_TYPE STREQUAL "Debug")
set_target_properties(tango-static PROPERTIES PREFIX "lib")
target_compile_options(tango PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
- target_compile_options(tango-static PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER} "/MT")
+ target_compile_options(tango-static PUBLIC ${ZMQ_PKG_CFLAGS_OTHER} ${OMNIORB_PKG_CFLAGS_OTHER} ${OMNICOS_PKG_CFLAGS_OTHER} ${OMNIDYN_PKG_CFLAGS_OTHER})
target_link_libraries(tango PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_DYN} ${ZMQ_PKG_LIBRARIES_DYN} ${PTHREAD_WIN_PKG_LIBRARIES_DYN} ${CMAKE_DL_LIBS})
target_link_libraries(tango-static PUBLIC ${WIN32_LIBS} ${OMNIORB_PKG_LIBRARIES_STA} ${ZMQ_PKG_LIBRARIES_STA} ${PTHREAD_WIN_PKG_LIBRARIES_STA} ${CMAKE_DL_LIBS})
diff --git a/cppapi/client/CMakeLists.txt b/cppapi/client/CMakeLists.txt
index 5be3035..58e904f 100644
--- a/cppapi/client/CMakeLists.txt
+++ b/cppapi/client/CMakeLists.txt
@@ -63,11 +63,11 @@ if(WIN32)
target_compile_definitions(client_objects_dyn PRIVATE "${dyn_defs}")
target_compile_definitions(client_objects_sta PRIVATE "${static_defs}")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(client_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(client_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(client_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(client_objects_sta PRIVATE "/MT")
+ # endif()
else(WIN32)
add_library(client_objects OBJECT ${SOURCES})
target_compile_options(client_objects PRIVATE -fPIC)
diff --git a/cppapi/server/CMakeLists.txt b/cppapi/server/CMakeLists.txt
index 1475915..00c4157 100644
--- a/cppapi/server/CMakeLists.txt
+++ b/cppapi/server/CMakeLists.txt
@@ -145,11 +145,11 @@ if(WIN32)
target_compile_definitions(server_objects_dyn PRIVATE "${dyn_defs}")
target_compile_definitions(server_objects_sta PRIVATE "${static_defs}")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(server_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(server_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(server_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(server_objects_sta PRIVATE "/MT")
+ # endif()
else(WIN32)
add_library(server_objects OBJECT ${SOURCES})
target_compile_options(server_objects PRIVATE -fPIC)
diff --git a/cppapi/server/idl/CMakeLists.txt b/cppapi/server/idl/CMakeLists.txt
index cece00f..73bd44e 100644
--- a/cppapi/server/idl/CMakeLists.txt
+++ b/cppapi/server/idl/CMakeLists.txt
@@ -56,11 +56,11 @@ if(WIN32)
target_compile_definitions(idl_objects_dyn PRIVATE "${dyn_defs};__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;")
target_compile_definitions(idl_objects_sta PRIVATE "${static_defs};__x86__;__NT__;__OSVERSION__=4;__WIN32__;_WIN32_WINNT=0x0400;")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(idl_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(idl_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(idl_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(idl_objects_sta PRIVATE "/MT")
+ # endif()
install(FILES tango.h DESTINATION include/idl)
else(WIN32)
add_library(idl_objects OBJECT ${SOURCES} tango.h)
diff --git a/cppapi/server/jpeg/CMakeLists.txt b/cppapi/server/jpeg/CMakeLists.txt
index 08075c5..4a6a8f6 100644
--- a/cppapi/server/jpeg/CMakeLists.txt
+++ b/cppapi/server/jpeg/CMakeLists.txt
@@ -10,11 +10,11 @@ if(WIN32)
target_compile_definitions(jpeg_objects_dyn PRIVATE "${dyn_defs}")
target_compile_definitions(jpeg_objects_sta PRIVATE "${static_defs}")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(jpeg_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(jpeg_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(jpeg_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(jpeg_objects_sta PRIVATE "/MT")
+ # endif()
else(WIN32)
add_library(jpeg_objects OBJECT ${SOURCES})
target_compile_options(jpeg_objects PRIVATE -fPIC)
diff --git a/cppapi/server/jpeg_mmx/CMakeLists.txt b/cppapi/server/jpeg_mmx/CMakeLists.txt
index 927e902..8f719d3 100644
--- a/cppapi/server/jpeg_mmx/CMakeLists.txt
+++ b/cppapi/server/jpeg_mmx/CMakeLists.txt
@@ -10,11 +10,11 @@ if(WIN32)
target_compile_definitions(jpeg_mmx_objects_dyn PRIVATE "${dyn_defs}")
target_compile_definitions(jpeg_mmx_objects_sta PRIVATE "${static_defs}")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(jpeg_mmx_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(jpeg_mmx_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(jpeg_mmx_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(jpeg_mmx_objects_sta PRIVATE "/MT")
+ # endif()
if(${PLATFORM} EQUAL 64)
target_compile_definitions(jpeg_mmx_objects_dyn PRIVATE _64BITS)
target_compile_definitions(jpeg_mmx_objects_sta PRIVATE _64BITS)
diff --git a/log4tango/src/CMakeLists.txt b/log4tango/src/CMakeLists.txt
index a55b7ec..3d65650 100644
--- a/log4tango/src/CMakeLists.txt
+++ b/log4tango/src/CMakeLists.txt
@@ -30,11 +30,11 @@ if(WIN32)
target_compile_definitions(log4tango_objects_dyn PRIVATE "${dyn_defs}")
target_compile_definitions(log4tango_objects_sta PRIVATE "${static_defs}")
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_options(log4tango_objects_sta PRIVATE "/MTd")
- else()
- target_compile_options(log4tango_objects_sta PRIVATE "/MT")
- endif()
+ # if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ # target_compile_options(log4tango_objects_sta PRIVATE "/MTd")
+ # else()
+ # target_compile_options(log4tango_objects_sta PRIVATE "/MT")
+ # endif()
else(WIN32)
add_library(log4tango_objects OBJECT ${SOURCES})
target_compile_options(log4tango_objects PRIVATE -fPIC)