Skip to content

Commit 5bb0b58

Browse files
committed
Дорабатываем сборку под разные OS
1 parent 960ae61 commit 5bb0b58

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

CMakeLists.txt

Lines changed: 14 additions & 8 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(GLB_PARAMS "-Wno-cpp -Wno-deprecated")
6060
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
61-
set(GLB_PARAMS "-lutil -Wno-cpp -Wno-deprecated ")
61+
set(GLB_PARAMS "-Wno-cpp -Wno-deprecated")
6262
else()
6363
set(GLB_PARAMS "-Wno-unknown-attributes")
6464
endif()
@@ -154,10 +154,15 @@ add_library(${ASC_LIB_NAME} STATIC ${SOURCE_FILES})
154154
# Если установлен флаг ENABLE_CONSOLE_APP собираем консольное приложение
155155
if (ENABLE_CONSOLE_APP)
156156

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

163168
# Устанавливаем иконку для windows под MinGW.
@@ -176,19 +181,20 @@ if (ENABLE_CONSOLE_APP)
176181
target_link_libraries(${ASC_APP_NAME}
177182
${ASC_LIB_NAME}
178183
${ALM_LIBRARY}
179-
${ZLIB_LIBRARY}
180184
${PYTHON_LIBRARY}
181185
${OPENSSL_LIBRARIES}
182-
${WINFLAGS}
186+
${ZLIB_LIBRARY}
187+
${OS_FLAGS}
183188
)
184189
# Для всех остальных операционных систем
185190
else()
186191
target_link_libraries(${ASC_APP_NAME}
187192
${ASC_LIB_NAME}
188193
${ALM_LIBRARY}
189-
${ZLIB_LIBRARY}
190194
${PYTHON_LIBRARY}
191195
${OPENSSL_LIBRARIES}
196+
${ZLIB_LIBRARY}
197+
${OS_FLAGS}
192198
)
193199
endif()
194200

submodules/alm

0 commit comments

Comments
 (0)