Skip to content

Commit e627c14

Browse files
ngrewedavidchisnall
authored andcommitted
fix(libBlocksRuntime compatibility): Install proper compatibiltiy headers for libBlocksRuntime
1 parent abf629b commit e627c14

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Block.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include <objc/blocks_runtime.h>

Block_private.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include <objc/blocks_private.h>

CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ project(libobjc C ASM CXX)
44

55
INCLUDE (CheckCXXSourceCompiles)
66

7-
macro(install_symlink filepath sympath)
8-
if (UNIX)
9-
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} ${sympath})")
10-
install(CODE "message(\"-- Symlinking: ${sympath} -> ${filepath}\")")
11-
endif ()
12-
endmacro(install_symlink)
13-
147
set(CMAKE_C_FLAGS_DEBUG "-O0 -Xclang -fno-inline ${CMAKE_C_FLAGS_DEBUG}")
158
set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
169
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
@@ -78,7 +71,10 @@ set(libobjc_HDRS
7871
objc/runtime-deprecated.h
7972
objc/runtime.h
8073
objc/slot.h)
81-
74+
set(libBlocksRuntime_COMPATIBILITY_HDRS
75+
Block.h
76+
Block_private.h
77+
)
8278
# Windows does not use DWARF EH
8379
if (WIN32)
8480
list(APPEND libobjc_CXX_SRCS eh_win32_msvc.cc)
@@ -391,9 +387,8 @@ install(TARGETS ${INSTALL_TARGETS}
391387
ARCHIVE DESTINATION ${LIB_INSTALL_PATH})
392388
install(FILES ${libobjc_HDRS}
393389
DESTINATION "${HEADER_INSTALL_PATH}/${INCLUDE_DIRECTORY}")
394-
395-
install_symlink(${CMAKE_INSTALL_PREFIX}/${HEADER_INSTALL_PATH}/${INCLUDE_DIRECTORY}/blocks_runtime.h ${CMAKE_INSTALL_PREFIX}/${HEADER_INSTALL_PATH}/Block.h)
396-
install_symlink(${CMAKE_INSTALL_PREFIX}/${HEADER_INSTALL_PATH}/${INCLUDE_DIRECTORY}/blocks_private.h ${CMAKE_INSTALL_PREFIX}/${HEADER_INSTALL_PATH}/Block_private.h)
390+
install(FILES ${libBlocksRuntime_COMPATIBILITY_HDRS}
391+
DESTINATION "${HEADER_INSTALL_PATH}")
397392

398393
set(CPACK_GENERATOR TGZ CACHE STRING
399394
"Installer types to generate. Sensible options include TGZ, RPM and DEB")

0 commit comments

Comments
 (0)