Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 468254 | Differences between
and this patch

Collapse All | Expand All

(-)CMakeLists_old.txt (-14 / +5 lines)
Lines 224-246 Link Here
224
# - on unices to prevent symbol collisions when tracing applications that link
224
# - on unices to prevent symbol collisions when tracing applications that link
225
# against other versions of these libraries
225
# against other versions of these libraries
226
226
227
set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
227
find_package (ZLIB REQUIRED)
228
set (ZLIB_LIBRARIES z_bundled)
228
include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
229
add_subdirectory (thirdparty/zlib)
230
231
include_directories (${ZLIB_INCLUDE_DIRS})
232
233
set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
234
set (SNAPPY_LIBRARIES snappy_bundled)
235
add_subdirectory (thirdparty/snappy)
236
229
230
find_package(SNAPPY REQUIRED)
237
include_directories (${SNAPPY_INCLUDE_DIRS})
231
include_directories (${SNAPPY_INCLUDE_DIRS})
238
232
239
set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
233
find_package (PNG REQUIRED)
240
set (PNG_DEFINITIONS "")
234
include_directories (${PNG_INCLUDE_DIRS})
241
set (PNG_LIBRARIES png_bundled)
242
243
add_subdirectory (thirdparty/libpng)
244
235
245
if (MSVC)
236
if (MSVC)
246
    add_subdirectory (thirdparty/getopt)
237
    add_subdirectory (thirdparty/getopt)

Return to bug 468254