1. 19 Jun, 2013 2 commits
    • Merge pull request #1660 from trast/tr/fix-zlib-configuration · 5144850c
      CMakeLists: fix zlib linker setup
      Vicent Martí committed
    • CMakeLists: fix zlib linker setup · c41281ad
      b53671ae (Search for zlib unconditional, 2012-12-18) changed things
      around to always (even on windows, that's what the subject refers to)
      call FIND_PACKAGE(ZLIB).
      
      However, it did not correctly handle the case where ZLIB_LIBRARY is
      cached, either by the user setting it manually or by an earlier
      search.  In that case, the IF(ZLIB_FOUND) would not trigger (that
      variable is not cached) and we'd instead use the built-in version.
      
      000e6896 (CMake: don't try to use bundled zlib when the system's path
      is in the cache, 2013-05-12) tried to fix that, but it actually made
      the problem worse: now with ZLIB_LIBRARY cached, _neither_ of the
      blocks would execute, resulting in a linker error for me when trying
      to build such a doubly-configured setup.
      
      To fix the issue, we just trust CMake to do the right thing.  If
      ZLIB_LIBRARY is set (either from user or cache) then the find_library
      in FindZLIB.cmake will use that instead of searching again.  So we can
      unconditionally (for real this time) call FIND_PACKAGE(ZLIB), and just
      check its result.
      Thomas Rast committed
  2. 18 Jun, 2013 6 commits
  3. 17 Jun, 2013 23 commits
  4. 14 Jun, 2013 3 commits
  5. 13 Jun, 2013 2 commits
  6. 12 Jun, 2013 4 commits