Skip to content

Commit 0ca5626

Browse files
committed
Дорабатываем сборку под разные OS
1 parent 9d71225 commit 0ca5626

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

CMakeLists.txt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
5858
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
5959
set(TON_PARAMS "-Wno-cpp -Wno-deprecated")
6060
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
61-
set(TON_PARAMS "-lutil -Wno-cpp -Wno-deprecated ")
61+
set(TON_PARAMS "-Wno-cpp -Wno-deprecated")
6262
else()
6363
set(TON_PARAMS "-Wno-unknown-attributes")
6464
endif()
@@ -155,10 +155,15 @@ add_library(${ALM_LIB_NAME} STATIC ${SOURCE_FILES})
155155
# Если установлен флаг ENABLE_CONSOLE_APP собираем консольное приложение
156156
if (ENABLE_CONSOLE_APP)
157157

158-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
159-
set(WINFLAGS -lws2_32 -lgdi32 -lcrypt32 -lIphlpapi)
160-
else()
161-
set(WINFLAGS "")
158+
# Проставляем платформозависимые зависимости
159+
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
160+
set(OS_FLAGS "-lutil -Xlinker -export-dynamic")
161+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
162+
set(OS_FLAGS "-lutil -Xlinker -export-dynamic")
163+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
164+
set(OS_FLAGS -lws2_32 -lgdi32 -lcrypt32 -lIphlpapi)
165+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
166+
set(OS_FLAGS "")
162167
endif()
163168

164169
# Устанавливаем иконку для windows под MinGW.
@@ -179,7 +184,7 @@ if (ENABLE_CONSOLE_APP)
179184
${PYTHON_LIBRARY}
180185
${OPENSSL_LIBRARIES}
181186
${ZLIB_LIBRARY}
182-
${WINFLAGS}
187+
${OS_FLAGS}
183188
)
184189
# Для всех остальных операционных систем
185190
else()
@@ -188,6 +193,7 @@ if (ENABLE_CONSOLE_APP)
188193
${PYTHON_LIBRARY}
189194
${OPENSSL_LIBRARIES}
190195
${ZLIB_LIBRARY}
196+
${OS_FLAGS}
191197
)
192198
endif()
193199

0 commit comments

Comments
 (0)