Skip to content

build: ♻️ some refacto in CMakeLists #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dubusster merged 1 commit into from
Nov 21, 2023
Merged

build: ♻️ some refacto in CMakeLists #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 13 additions & 34 deletions extra/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@

SET(ZSTD_SRC
${CMAKE_CURRENT_SOURCE_DIR}/zstd/fse_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v01.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v06.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/entropy_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zdict.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v04.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/error_private.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/hash.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/pool.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstdmt_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v02.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v07.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/cover.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/huf_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v05.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/divsufsort.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/fse_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/huf_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/threading.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v03.c
PARENT_SCOPE
)

IF(MSVC)
SET(MINIZIP_SRC
Expand Down Expand Up @@ -113,11 +84,10 @@ SET(MINIZIP_SRC
)
ENDIF()

SET(ZSTD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zstd PARENT_SCOPE)

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zstd)

SET(ZSTD_INCLUDE_DIR
${CMAKE_CURRENT_SOURCE_DIR}
PARENT_SCOPE
)

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/blosc)
SET(BLOSC_SRC ${BLOSC_SRC} PARENT_SCOPE)
Expand All @@ -132,4 +102,13 @@ SET(JPEG9B_SRC ${JPEG9B_SRC} PARENT_SCOPE)
SET(CHARLS_SRC ${CHARLS_SRC} PARENT_SCOPE)


SET(EXTRAS_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
SET(EXTRAS_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)

SET(ZSTD_INCLUDE_DIR
${ZSTD_INCLUDE_DIR}
PARENT_SCOPE
)
SET(ZSTD_SRC
${ZSTD_SRC}
PARENT_SCOPE
)
47 changes: 47 additions & 0 deletions extra/zstd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

SET(ZSTD_SRC
${CMAKE_CURRENT_SOURCE_DIR}/fse_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v01.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v06.c
${CMAKE_CURRENT_SOURCE_DIR}/entropy_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zdict.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v04.c
${CMAKE_CURRENT_SOURCE_DIR}/error_private.c
${CMAKE_CURRENT_SOURCE_DIR}/hash.c
${CMAKE_CURRENT_SOURCE_DIR}/pool.c
${CMAKE_CURRENT_SOURCE_DIR}/zbuff_common.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstdmt_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v02.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v07.c
${CMAKE_CURRENT_SOURCE_DIR}/cover.c
${CMAKE_CURRENT_SOURCE_DIR}/huf_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zbuff_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v05.c
${CMAKE_CURRENT_SOURCE_DIR}/divsufsort.c
${CMAKE_CURRENT_SOURCE_DIR}/fse_compress.c
${CMAKE_CURRENT_SOURCE_DIR}/huf_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/threading.c
${CMAKE_CURRENT_SOURCE_DIR}/zbuff_decompress.c
${CMAKE_CURRENT_SOURCE_DIR}/zstd_v03.c
)

SET(ZSTD_SRC
${ZSTD_SRC}
PARENT_SCOPE
)

SET(ZSTD_INCLUDE_DIR
${CMAKE_CURRENT_SOURCE_DIR}

)

SET(ZSTD_INCLUDE_DIR
${ZSTD_INCLUDE_DIR}
PARENT_SCOPE
)


add_library(libzstd ${ZSTD_SRC})
2 changes: 1 addition & 1 deletion src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ ENDIF()

install (TARGETS ${TARGETS} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
install (TARGETS ${TARGETS} LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR} )
install(TARGETS ${TARGETS} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install (TARGETS ${TARGETS} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
install (TARGETS ${TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
install(TARGETS ${TARGETS} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

# message(STATUS ${EXCLUDED_TARGETS})

Expand Down