Attachment #639690 for bug #723418

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

Lines 47-52 endif() Link Here

(-)a/SDL/CMakeLists.txt (+1 lines)
47		47
48	if(SDL_FOUND)	48	if(SDL_FOUND)
49	if(UNIX)	49	if(UNIX)
		50	find_package ( UnixCommands REQUIRED ) # bash
50	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")	51	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
51	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")	52	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
52	add_custom_command(OUTPUT SDL_rwops_zzip.pc	53	add_custom_command(OUTPUT SDL_rwops_zzip.pc

Lines 194-199 SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE Link Here

(-)a/zzip/CMakeLists.txt (+2 lines)
194	endif()	194	endif()
195		195
196	if(ZZIPCOMPAT)	196	if(ZZIPCOMPAT)
		197	find_package ( UnixCommands REQUIRED ) # bash
197	add_custom_command(OUTPUT compat/zzip.h	198	add_custom_command(OUTPUT compat/zzip.h
198	COMMAND ${BASH} -c "rm -rf compat; mkdir compat"	199	COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
199	COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"	200	COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
Lines 215-220 add_custom_target(compat ALL DEPENDS compat/zzip.h) Link Here
215	endif()	216	endif()
216		217
217	if(UNIX)	218	if(UNIX)
		219	find_package ( UnixCommands REQUIRED ) # bash
218	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")	220	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
219	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")	221	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
220	add_custom_command(OUTPUT zziplib.pc	222	add_custom_command(OUTPUT zziplib.pc

Lines 49-54 target_link_libraries(zzipwrap libzzipwrap ) Link Here

(-)a/zzipwrap/CMakeLists.txt (+1 lines)
49	target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")	49	target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
50		50
51	if(UNIX)	51	if(UNIX)
		52	find_package ( UnixCommands REQUIRED ) # bash
52	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")	53	join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
53	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")	54	join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
54	add_custom_command(OUTPUT zzipwrap.pc	55	add_custom_command(OUTPUT zzipwrap.pc

Return to bug 723418