Skip to content

Commit

Permalink
cmakefix
Browse files Browse the repository at this point in the history
  • Loading branch information
Sheng Di committed Dec 20, 2019
1 parent 168a933 commit 4608a64
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ if(ZSTD_FOUND)
set(ZSTD_dep PkgConfig::ZSTD)
else()
add_subdirectory(zstd)
set(ZSTD_dep ZSTD)
list(APPEND thirdparty_export "ZSTD")
set(ZSTD_dep zstd)
list(APPEND thirdparty_export "zstd")
endif()

find_package(ZLIB)
Expand Down Expand Up @@ -107,7 +107,7 @@ if(BUILD_DOCKER_CONTAINERS)
set(Dockerfile docker/Dockerfile-${CONTAINER})
string(TOLOWER "sz${CONTAINER}" CONTAINER_TAG)
add_custom_command(OUTPUT ${BuildSentinel}
COMMAND docker build -t ${CONTAINER_TAG} -f ${Dockerfile} .
COMMAND sudo docker build -t ${CONTAINER_TAG} -f ${Dockerfile} .
COMMAND touch ${BuildSentinel}
MAIN_DEPENDENCY ${Dockerfile}
DEPENDS SZ
Expand Down
8 changes: 4 additions & 4 deletions zstd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(ZSTD SHARED
add_library(zstd SHARED
./common/entropy_common.c
./common/pool.c
./common/threading.c
Expand Down Expand Up @@ -34,7 +34,7 @@ add_library(ZSTD SHARED
./dictBuilder/zdict.c
)

target_include_directories(ZSTD
target_include_directories(zstd
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
PRIVATE
Expand All @@ -48,7 +48,7 @@ target_include_directories(ZSTD
)


install(TARGETS ZSTD EXPORT ZSTDConfig
install(TARGETS zstd EXPORT ZSTDConfig
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
Expand All @@ -59,6 +59,6 @@ install(FILES
common/zstd_errors.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
)
export(TARGETS ZSTD FILE ZSTDConfig.cmake)
export(TARGETS zstd FILE ZSTDConfig.cmake)


0 comments on commit 4608a64

Please sign in to comment.