My working unpac space for OCaml projects in development
Merge pull request #4494 from LecrisUT/maint-cmake
Split lib target types in their own export groups
authored by
Yann Collet
and committed by
GitHub
9bbebb44
4afbbe89
+32
-29
+15
-12
vendor/git/zstd-c/build/cmake/CMakeModules/ZstdPackage.cmake
+15
-12
vendor/git/zstd-c/build/cmake/CMakeModules/ZstdPackage.cmake
···
11
11
COMPATIBILITY SameMajorVersion
12
12
)
13
13
14
-
# Export targets for build directory
15
-
export(EXPORT zstdExports
16
-
FILE "${CMAKE_CURRENT_BINARY_DIR}/zstdTargets.cmake"
17
-
NAMESPACE zstd::
18
-
)
19
-
20
14
# Configure package for installation
21
15
set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/zstd)
22
16
23
-
# Install exported targets
24
-
install(EXPORT zstdExports
25
-
FILE zstdTargets.cmake
26
-
NAMESPACE zstd::
27
-
DESTINATION ${ConfigPackageLocation}
28
-
)
17
+
foreach(target_suffix IN ITEMS "_shared" "_static" "")
18
+
if(TARGET "libzstd${target_suffix}")
19
+
# Export targets for build directory
20
+
export(EXPORT "zstdExports${target_suffix}"
21
+
FILE "${CMAKE_CURRENT_BINARY_DIR}/zstdTargets${target_suffix}.cmake"
22
+
NAMESPACE zstd::
23
+
)
24
+
# Install exported targets
25
+
install(EXPORT "zstdExports${target_suffix}"
26
+
FILE "zstdTargets${target_suffix}.cmake"
27
+
NAMESPACE zstd::
28
+
DESTINATION ${ConfigPackageLocation}
29
+
)
30
+
endif()
31
+
endforeach()
29
32
30
33
# Configure and install package config file
31
34
configure_package_config_file(
+14
-17
vendor/git/zstd-c/build/cmake/lib/CMakeLists.txt
+14
-17
vendor/git/zstd-c/build/cmake/lib/CMakeLists.txt
···
123
123
set(PUBLIC_INCLUDE_DIRS ${LIBRARY_DIR})
124
124
set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /I \"${LIBRARY_DIR}\"")
125
125
# Split project to static and shared libraries build
126
-
set(library_targets)
127
126
if (ZSTD_BUILD_SHARED)
128
127
add_library(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources})
129
128
target_include_directories(libzstd_shared INTERFACE $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIRS}>)
130
-
list(APPEND library_targets libzstd_shared)
131
129
if (ZSTD_MULTITHREAD_SUPPORT)
132
130
target_compile_definitions(libzstd_shared PUBLIC ZSTD_MULTITHREAD)
133
131
if (UNIX)
···
141
139
if (ZSTD_BUILD_STATIC)
142
140
add_library(libzstd_static STATIC ${Sources} ${Headers})
143
141
target_include_directories(libzstd_static INTERFACE $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIRS}>)
144
-
list(APPEND library_targets libzstd_static)
145
142
if (ZSTD_MULTITHREAD_SUPPORT)
146
143
target_compile_definitions(libzstd_static PUBLIC ZSTD_MULTITHREAD)
147
144
if (UNIX)
···
160
157
endif ()
161
158
add_library(libzstd INTERFACE)
162
159
target_link_libraries(libzstd INTERFACE libzstd_shared)
163
-
list(APPEND library_targets libzstd)
164
160
endif ()
165
161
if (ZSTD_BUILD_STATIC AND NOT ZSTD_BUILD_SHARED)
166
162
if (BUILD_SHARED_LIBS)
···
168
164
endif ()
169
165
add_library(libzstd INTERFACE)
170
166
target_link_libraries(libzstd INTERFACE libzstd_static)
171
-
list(APPEND library_targets libzstd)
172
167
endif ()
173
168
if (ZSTD_BUILD_SHARED AND ZSTD_BUILD_STATIC)
174
169
# If both ZSTD_BUILD_SHARED and ZSTD_BUILD_STATIC are set, which is the
···
177
172
if (BUILD_SHARED_LIBS)
178
173
add_library(libzstd INTERFACE)
179
174
target_link_libraries(libzstd INTERFACE libzstd_shared)
180
-
list(APPEND library_targets libzstd)
181
175
else ()
182
176
add_library(libzstd INTERFACE)
183
177
target_link_libraries(libzstd INTERFACE libzstd_static)
184
-
list(APPEND library_targets libzstd)
185
178
endif ()
186
179
endif ()
187
180
···
275
268
# install target
276
269
install(FILES ${PublicHeaders} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
277
270
278
-
install(TARGETS ${library_targets}
279
-
EXPORT zstdExports
280
-
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
281
-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
282
-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
283
-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
284
-
BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
285
-
FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT runtime OPTIONAL
286
-
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
287
-
)
271
+
foreach(target_suffix IN ITEMS "_shared" "_static" "")
272
+
if(TARGET "libzstd${target_suffix}")
273
+
install(TARGETS "libzstd${target_suffix}"
274
+
EXPORT "zstdExports${target_suffix}"
275
+
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
276
+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
277
+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
278
+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
279
+
BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
280
+
FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT runtime OPTIONAL
281
+
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
282
+
)
283
+
endif()
284
+
endforeach()
288
285
289
286
# uninstall target
290
287
if (NOT TARGET uninstall)
+3
vendor/git/zstd-c/build/cmake/zstdConfig.cmake.in
+3
vendor/git/zstd-c/build/cmake/zstdConfig.cmake.in
···
5
5
find_dependency(Threads)
6
6
endif()
7
7
8
+
foreach(lib_suffix IN ITEMS "_shared" "_static")
9
+
include("${CMAKE_CURRENT_LIST_DIR}/zstdTargets${lib_suffix}.cmake" OPTIONAL)
10
+
endforeach()
8
11
include("${CMAKE_CURRENT_LIST_DIR}/zstdTargets.cmake")
9
12
10
13
check_required_components("zstd")