| 1 | --- ../cache/apt-1.4.7/CMakeLists.txt 2017-07-14 07:45:39.000000000 +1000 |
| 2 | +++ ./CMakeLists.txt 2017-07-20 13:31:00.727044330 +1000 |
| 3 | @@ -33,7 +33,7 @@ |
| 4 | include(GNUInstallDirs) |
| 5 | include(TestBigEndian) |
| 6 | find_package(Threads) |
| 7 | -find_package(LFS REQUIRED) |
| 8 | +# find_package(LFS REQUIRED) |
| 9 | find_package(Iconv REQUIRED) |
| 10 | |
| 11 | find_package(Perl REQUIRED) |
| 12 | @@ -45,9 +45,9 @@ |
| 13 | endif() |
| 14 | |
| 15 | # Add large file support |
| 16 | -add_compile_options(${LFS_COMPILE_OPTIONS}) |
| 17 | -add_definitions(${LFS_DEFINITIONS}) |
| 18 | -link_libraries(${LFS_LIBRARIES}) |
| 19 | +# add_compile_options(${LFS_COMPILE_OPTIONS}) |
| 20 | +# add_definitions(${LFS_DEFINITIONS}) |
| 21 | +# link_libraries(${LFS_LIBRARIES}) |
| 22 | |
| 23 | # Set compiler flags |
| 24 | set(CMAKE_CXX_STANDARD 11) |
| 25 | @@ -100,10 +100,6 @@ |
| 26 | endif() |
| 27 | |
| 28 | |
| 29 | -find_package(LZ4) |
| 30 | -if (LZ4_FOUND) |
| 31 | - set(HAVE_LZ4 1) |
| 32 | -endif() |
| 33 | |
| 34 | # Mount()ing and stat()ing and friends |
| 35 | check_symbol_exists(statfs sys/vfs.h HAVE_VFS_H) |
| 36 | @@ -180,10 +176,10 @@ |
| 37 | message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}") |
| 38 | set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory") |
| 39 | endif() |
| 40 | -if (NOT DEFINED COMMON_ARCH) |
| 41 | - execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH |
| 42 | - OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 43 | -endif() |
| 44 | +# if (NOT DEFINED COMMON_ARCH) |
| 45 | +# execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH |
| 46 | + #OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 47 | +# endif() |
| 48 | if (NOT DEFINED ROOT_GROUP) |
| 49 | execute_process(COMMAND id -gn root |
| 50 | OUTPUT_VARIABLE ROOT_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 51 | @@ -211,7 +207,6 @@ |
| 52 | add_subdirectory(apt-inst) |
| 53 | add_subdirectory(cmdline) |
| 54 | add_subdirectory(completions) |
| 55 | -add_subdirectory(doc) |
| 56 | add_subdirectory(dselect) |
| 57 | add_subdirectory(ftparchive) |
| 58 | add_subdirectory(methods) |