haru/libaribb25
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aribb25_api.h への依存を削除

Browse Source 
自動生成されるヘッダファイルが CMake に依存していたため
This commit is contained in:
tsukumijima 2021-10-23 05:18:59 +09:00
parent adb2dab625
commit b3f0b2c378
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -118,7 +118,6 @@ set_target_properties(aribb25-shared PROPERTIES OUTPUT_NAME ${ARIBB25_LIB_NAME})
set_target_properties(aribb25-shared PROPERTIES SOVERSION ${ARIBB25_MAJOR_VERSION})
set_target_properties(aribb25-shared PROPERTIES VERSION ${ARIBB25_VERSION_NUMBER})
target_link_libraries(aribb25-shared PRIVATE ${PCSC_LIBRARIES})
generate_export_header(aribb25-shared BASE_NAME aribb25_api EXPORT_FILE_NAME aribb25_api.h)
add_executable(b25 src/td.c ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
set_target_properties(b25 PROPERTIES OUTPUT_NAME ${ARIBB25_CMD_NAME})
@ -133,7 +132,7 @@ if(UNIX AND NOT CYGWIN)
install(TARGETS b25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS aribb25-static aribb25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/aribb25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARIBB25_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)")
@ -141,6 +140,6 @@ if(UNIX AND NOT CYGWIN)
elseif(WIN32)
install(TARGETS b25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS aribb25-static aribb25-shared ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/aribb25_api.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/aribb25)
add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake)
endif()

1
aribb25/arib_std_b25.h
View File

@ -1,7 +1,6 @@
#ifndef ARIB_STD_B25_H
#define ARIB_STD_B25_H
#include "aribb25_api.h"
#include "portable.h"
#include "b_cas_card.h"

1
aribb25/b_cas_card.h
View File

@ -1,7 +1,6 @@
#ifndef B_CAS_CARD_H
#define B_CAS_CARD_H
#include "aribb25_api.h"
#include "portable.h"
typedef struct {

1
aribb25/multi2.h
View File

@ -1,7 +1,6 @@
#ifndef MULTI2_H
#define MULTI2_H
#include "aribb25_api.h"
#include "portable.h"
#include "simd_instruction_type.h"

1
aribb25/ts_section_parser.h
View File

@ -1,7 +1,6 @@
#ifndef TS_SECTION_PARSER_H
#define TS_SECTION_PARSER_H
#include "aribb25_api.h"
#include "ts_common_types.h"
typedef struct {