Attachment #782621 for bug #849578

View | Details | Raw Unified | Return to bug 849578
Collapse All | Expand All

Lines 163-169 if(NOT BUILD_HEADER_ONLY) Link Here

(-)a/CMakeLists.txt (-2 / +6 lines)
163	if(INSTALL_PROJECT)	163	if(INSTALL_PROJECT)
164	install(FILES	164	install(FILES
165	${CMAKE_CURRENT_BINARY_DIR}/miniz.pc	165	${CMAKE_CURRENT_BINARY_DIR}/miniz.pc
166	DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)	166	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
167	endif()	167	endif()
168	endif()	168	endif()
Lines 173-185 set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY Link Here
173	COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION	173	COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
174	)	174	)
		175	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
		176
175	if(INSTALL_PROJECT)	177	if(INSTALL_PROJECT)
		178	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
		179
176	install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets	180	install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
177	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}	181	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
178	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}	182	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
179	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}	183	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
180	# users can use <miniz.h> or <miniz/miniz.h>	184	# users can use <miniz.h> or <miniz/miniz.h>
181	INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}	185	INCLUDES DESTINATION include ${MINIZ_INCLUDE_DIR}
182	)	186	)
183	include(CMakePackageConfigHelpers)	187	include(CMakePackageConfigHelpers)

Lines 1-7 Link Here

(-)a/miniz.pc.in (-1 / +1 lines)
1	prefix=@CMAKE_INSTALL_PREFIX@	1	prefix=@CMAKE_INSTALL_PREFIX@
2	exec_prefix=${prefix}	2	exec_prefix=${prefix}
3	libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@	3	libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
4	includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@	4	includedir=${prefix}/@MINIZ_INCLUDE_DIR@
5	Name: @PROJECT_NAME@	5	Name: @PROJECT_NAME@
6	Description: @PROJECT_DESCRIPTION@	6	Description: @PROJECT_DESCRIPTION@

Lines 153-158 else(AMALGAMATE_SOURCES) Link Here

(-)a/CMakeLists.txt (-2 / +2 lines)
153	INSTALL_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h)	153	INSTALL_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h)
154	endif(AMALGAMATE_SOURCES)	154	endif(AMALGAMATE_SOURCES)
		155	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
		156
155	if(NOT BUILD_HEADER_ONLY)	157	if(NOT BUILD_HEADER_ONLY)
156	target_compile_definitions(${PROJECT_NAME}	158	target_compile_definitions(${PROJECT_NAME}
157	PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)	159	PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)
Lines 173-180 set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY Link Here
173	COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION	175	COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
174	)	176	)
175	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
176
177	if(INSTALL_PROJECT)	177	if(INSTALL_PROJECT)
178	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})	178	set(MINIZ_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})

Return to bug 849578