@@ -46,14 +46,13 @@ endif ()
46
46
if (APPLE )
47
47
# target system is macOS, iOS, tvOS or watchOS
48
48
add_compile_options (-Wno-deprecated-declarations)
49
- add_compile_options ($<$<CONFIG:RELEASE>:-fembed-bitcode>)
50
49
endif ()
51
50
52
51
if (IOS)
53
52
# target system is iOS
54
53
message (STATUS "Yunxin: Configure for [iOS]" )
55
54
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
56
- set (CMAKE_OSX_DEPLOYMENT_TARGET 9.3 CACHE STRING "Minimum iOS deployment version" FORCE)
55
+ set (CMAKE_OSX_DEPLOYMENT_TARGET 10.0 CACHE STRING "Minimum iOS deployment version" FORCE)
57
56
endif ()
58
57
if (CMAKE_OSX_ARCHITECTURES STREQUAL "armv7" )
59
58
add_compile_options (-fno-aligned-allocation)
@@ -92,7 +91,7 @@ endif ()
92
91
93
92
# pre-commit hooks
94
93
macro (ne_install_pre_commit_hooks)
95
- if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR} /.git/hooks/pre-commit AND "CMAKE_BUILD_TYPE" STREQUAL "Debug" )
94
+ if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR} /.git/hooks/pre-commit)
96
95
find_package (Python3 COMPONENTS Interpreter Development)
97
96
98
97
if (POLICY CMP0094) # https://cmake.org/cmake/help/latest/policy/CMP0094.html
@@ -112,7 +111,7 @@ macro(ne_install_pre_commit_hooks)
112
111
find_package (Python REQUIRED COMPONENTS Interpreter)
113
112
message (STATUS "Python executable: ${Python_EXECUTABLE} " )
114
113
execute_process (COMMAND ${Python_EXECUTABLE} -m pip install pre-commit)
115
- execute_process (COMMAND pre-commit install WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} " )
114
+ execute_process (COMMAND pre-commit install --hook- type commit-msg WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} " )
116
115
endif ()
117
116
endmacro ()
118
117
@@ -122,12 +121,12 @@ macro(ne_install_conan_packages)
122
121
execute_process (COMMAND conan config set general.revisions_enabled=True )
123
122
include (${CMAKE_SOURCE_DIR} /.cmake/conan.cmake)
124
123
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" )
125
- set (CONAN_ENV_CFLAGS "CFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden" )
126
- set (CONAN_ENV_CXXFLAGS "CXXFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden" )
124
+ set (CONAN_ENV_CFLAGS "CFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations -g3 -DUV_EXTERN= " )
125
+ set (CONAN_ENV_CXXFLAGS "CXXFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations -g3 " )
127
126
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" )
128
- set (CONAN_ENV_CFLAGS "CFLAGS=-fembed-bitcode - fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations" )
129
- set (CONAN_ENV_CXXFLAGS "CXXFLAGS=-fembed-bitcode - fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations" )
130
- set (CONAN_ENV_OBJCFLAGS "OBJCFLAGS=-fembed-bitcode - fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations" )
127
+ set (CONAN_ENV_CFLAGS "CFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations -g3 -DUV_EXTERN= " )
128
+ set (CONAN_ENV_CXXFLAGS "CXXFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations -g3 " )
129
+ set (CONAN_ENV_OBJCFLAGS "OBJCFLAGS=-fvisibility=hidden -fvisibility-inlines-hidden -Wno-error=deprecated-declarations" )
131
130
endif ()
132
131
if (CONAN_PROFILE_BUILD AND CONAN_PROFILE_HOST)
133
132
conan_cmake_install(PATH_OR_REFERENCE .. BUILD missing
@@ -142,7 +141,9 @@ macro(ne_install_conan_packages)
142
141
endif ()
143
142
endif ()
144
143
include (${CMAKE_BINARY_DIR} /conanbuildinfo.cmake)
145
- include (${CMAKE_BINARY_DIR} /conan_paths.cmake)
144
+ if (EXISTS ${CMAKE_BINARY_DIR} /conan_paths.cmake)
145
+ include (${CMAKE_BINARY_DIR} /conan_paths.cmake)
146
+ endif ()
146
147
conan_basic_setup(${PROJECT_NAME} KEEP_RPATHS)
147
148
endmacro ()
148
149
@@ -186,7 +187,13 @@ function(ne_add_library target)
186
187
FRAMEWORK_VERSION A
187
188
MACOSX_FRAMEWORK_IDENTIFIER ${arg_MACOSX_FRAMEWORK_IDENTIFIER}
188
189
MACHO_CURRENT_VERSION ${GIT_VERSION}
190
+ XCODE_ATTRIBUTE_ENABLE_BITCODE NO
189
191
)
192
+ if (NOT DEFINED arg_NO_SYMLINKS)
193
+ set_target_properties (${target} PROPERTIES
194
+ VERSION ${GIT_VERSION}
195
+ )
196
+ endif ()
190
197
if (CMAKE_BUILD_TYPE MATCHES "Release" )
191
198
set_target_properties (${target} PROPERTIES
192
199
XCODE_ATTRIBUTE_DEPLOYMENT_POSTPROCESSING YES
@@ -198,15 +205,12 @@ function(ne_add_library target)
198
205
)
199
206
endif ()
200
207
elseif (UNIX )
201
- if (arg_NO_SYMLINKS)
202
- set_target_properties (${target} PROPERTIES
203
- BUILD_WITH_INSTALL_RPATH 1
204
- INSTALL_RPATH "$ORIGIN"
205
- )
206
- else ()
208
+ set_target_properties (${target} PROPERTIES
209
+ BUILD_WITH_INSTALL_RPATH 1
210
+ INSTALL_RPATH "$ORIGIN"
211
+ )
212
+ if (NOT DEFINED arg_NO_SYMLINKS)
207
213
set_target_properties (${target} PROPERTIES
208
- BUILD_WITH_INSTALL_RPATH 1
209
- INSTALL_RPATH "$ORIGIN"
210
214
VERSION ${GIT_VERSION}
211
215
)
212
216
endif ()
@@ -226,39 +230,15 @@ function(ne_target_link_libraries target)
226
230
endfunction ()
227
231
228
232
function (_ne_target_install target )
229
- if (ANDROID)
230
- install (
231
- TARGETS ${target}
232
- ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX} /${CMAKE_ANDROID_ARCH_ABI}
233
- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} /${CMAKE_ANDROID_ARCH_ABI}
234
- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX} /${CMAKE_ANDROID_ARCH_ABI}
235
- PUBLIC_HEADER DESTINATION include
236
- )
237
- elseif (APPLE )
238
- install (
239
- TARGETS ${target}
240
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
241
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
242
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
243
- FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
244
- PUBLIC_HEADER DESTINATION include
245
- )
246
- elseif (MSVC )
247
- install (
248
- TARGETS ${target}
249
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
250
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
251
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
252
- PUBLIC_HEADER DESTINATION include
253
- )
233
+ install (
234
+ TARGETS ${target}
235
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
236
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
237
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
238
+ FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
239
+ PUBLIC_HEADER DESTINATION include
240
+ )
241
+ if (MSVC )
254
242
install (FILES $<TARGET_PDB_FILE:${target} > DESTINATION pdb OPTIONAL )
255
- elseif (UNIX )
256
- install (
257
- TARGETS ${target}
258
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
259
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
260
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
261
- PUBLIC_HEADER DESTINATION include
262
- )
263
243
endif ()
264
244
endfunction ()
0 commit comments