From: Peter Kuemmel Date: Sun, 18 Mar 2012 12:21:24 +0000 (+0100) Subject: Look in build directory for zlib.pc in CMakeLists.txt. X-Git-Tag: upstream/1.2.8~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bd5bd78a6f76553c38ab3a37e5b08b6c5f1610a;p=platform%2Fupstream%2Fzlib.git Look in build directory for zlib.pc in CMakeLists.txt. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 285305d..09725af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,8 +75,9 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) endif() endif() +set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein - ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc @ONLY) + ${ZLIB_PC} @ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) @@ -184,7 +185,7 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - install(FILES zlib.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}") + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") endif() #============================================================================