Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CR] CMake: update rules; add Linux install targets; add support for dev-builds; #11970

Merged
merged 97 commits into from May 9, 2015
Merged

[CR] CMake: update rules; add Linux install targets; add support for dev-builds; #11970

merged 97 commits into from May 9, 2015

Commits on Apr 10, 2015

  1. some cmake updates

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    cd2cb83 View commit details
    Browse the repository at this point in the history

  2. Finalize and clenup POC; Fixup install dst; Add ZLAYER and USE_HOME_DIR;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    56ab832 View commit details
    Browse the repository at this point in the history

  3. Add CMake rules for LUA target

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    2711340 View commit details
    Browse the repository at this point in the history

  4. Add chkjson target

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    f001929 View commit details
    Browse the repository at this point in the history

  5. Fixup hardcoded git binary :)

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    ab41bdc View commit details
    Browse the repository at this point in the history

  6. Cleanup; Remove BYPRODUCTS since it require cmake 3.x

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    69ba133 View commit details
    Browse the repository at this point in the history

  7. fixup version.cmake

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    b56c7af View commit details
    Browse the repository at this point in the history

  8. Add data install

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    a2eed21 View commit details
    Browse the repository at this point in the history

  9. Add SILENT build-only option; Fixup idents;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    b812106 View commit details
    Browse the repository at this point in the history

  10. Add data files install target; Add gfx install target;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    b21dd95 View commit details
    Browse the repository at this point in the history

  11. Add lang target; Fixup: Define PREFIX; Remove 'data' from DATA_PREFIX… 

    … dst;
    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    39a7c01 View commit details
    Browse the repository at this point in the history

  12. Remove 'data' from gfx target as well

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    cd9905a View commit details
    Browse the repository at this point in the history

  13. Rename DEBUG option to RELEASE; Add RELEASE defines;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    cec5b42 View commit details
    Browse the repository at this point in the history

  14. Fixup cmake warning

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    0b18bf7 View commit details
    Browse the repository at this point in the history

  15. Fixup install target for RELEASE=ON; Add workaround to be able to run… 

    … binary from cmake build directory;
    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    de3b470 View commit details
    Browse the repository at this point in the history

  16. Fixup WORKING_DIRECTORY for version.cmake in case of non tree build

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    a326ee7 View commit details
    Browse the repository at this point in the history

  17. Replace SILENT option with RELEASE

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    9066ac3 View commit details
    Browse the repository at this point in the history

  18. Fixup WORKING_DIRECTORY for version.cmake in case of non tree build. … 

    …try_v3
    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    e245c45 View commit details
    Browse the repository at this point in the history

  19. Install data/sound if SOUND is set

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    5435d9f View commit details
    Browse the repository at this point in the history

  20. Fixup catabindings.cpp recreation

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    213d66b View commit details
    Browse the repository at this point in the history

  21. Add i18n make targets: extract_string, translations_compile

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    5a0083d View commit details
    Browse the repository at this point in the history

  22. Search for Gettext; Some rules optimizations;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    2e37173 View commit details
    Browse the repository at this point in the history

  23. Exclude chkjson from ALL; Add tests target for json_verifier;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    cc181f5 View commit details
    Browse the repository at this point in the history

  24. Reoganize; Rename tests tartet to check_lua; Add check_json;

    @brezerk
    brezerk committed Apr 10, 2015
    Copy the full SHA
    11f2957 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Allow build curses and tiles wersions at the same time

    @brezerk
    brezerk committed Apr 11, 2015
    Copy the full SHA
    a840c6d View commit details
    Browse the repository at this point in the history

  2. Update debug definitions; Update FindCurses to find NCURSES and WIDE;

    @brezerk
    brezerk committed Apr 11, 2015
    Copy the full SHA
    7fc0772 View commit details
    Browse the repository at this point in the history

  3. Rename cmake to CMakeModules

    @brezerk
    brezerk committed Apr 11, 2015
    Copy the full SHA
    56f2a82 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2015

  1. Rework generation catabindings.cpp process

    @brezerk
    brezerk committed Apr 12, 2015
    Copy the full SHA
    633d926 View commit details
    Browse the repository at this point in the history

  2. Rework src/version.h generation

    @brezerk
    brezerk committed Apr 12, 2015
    Copy the full SHA
    84b1c27 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2015

  1. Revert path_info.cpp changes

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    9060f9a View commit details
    Browse the repository at this point in the history

  2. Create binaries in source tree; Add LUA defenitions; Cleanup;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    5e43d2b View commit details
    Browse the repository at this point in the history

  3. Correct dev-build path info

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    0cea60f View commit details
    Browse the repository at this point in the history

  4. some cmake updates

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    a88abf4 View commit details
    Browse the repository at this point in the history

  5. Finalize and clenup POC; Fixup install dst; Add ZLAYER and USE_HOME_DIR;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    a395ee7 View commit details
    Browse the repository at this point in the history

  6. Add CMake rules for LUA target

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    95f9cac View commit details
    Browse the repository at this point in the history

  7. Add chkjson target

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    3614a40 View commit details
    Browse the repository at this point in the history

  8. Fixup hardcoded git binary :)

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    e11a327 View commit details
    Browse the repository at this point in the history

  9. Cleanup; Remove BYPRODUCTS since it require cmake 3.x

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    5fd3bae View commit details
    Browse the repository at this point in the history

  10. fixup version.cmake

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    a005c0c View commit details
    Browse the repository at this point in the history

  11. Add data install

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    b4aa171 View commit details
    Browse the repository at this point in the history

  12. Add SILENT build-only option; Fixup idents;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    edfd991 View commit details
    Browse the repository at this point in the history

  13. Add data files install target; Add gfx install target;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    a8042ed View commit details
    Browse the repository at this point in the history

  14. Add lang target; Fixup: Define PREFIX; Remove 'data' from DATA_PREFIX… 

    … dst;
    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    8046a32 View commit details
    Browse the repository at this point in the history

  15. Remove 'data' from gfx target as well

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    b243120 View commit details
    Browse the repository at this point in the history

  16. Rename DEBUG option to RELEASE; Add RELEASE defines;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    82df0d6 View commit details
    Browse the repository at this point in the history

  17. Fixup cmake warning

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    50f64de View commit details
    Browse the repository at this point in the history

  18. Fixup install target for RELEASE=ON; Add workaround to be able to run… 

    … binary from cmake build directory;
    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    0a13361 View commit details
    Browse the repository at this point in the history

  19. Fixup WORKING_DIRECTORY for version.cmake in case of non tree build

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    5279f0a View commit details
    Browse the repository at this point in the history

  20. Replace SILENT option with RELEASE

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    b0f0110 View commit details
    Browse the repository at this point in the history

  21. Fixup WORKING_DIRECTORY for version.cmake in case of non tree build. … 

    …try_v3
    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    d383568 View commit details
    Browse the repository at this point in the history

  22. Install data/sound if SOUND is set

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    8ed9578 View commit details
    Browse the repository at this point in the history

  23. Fixup catabindings.cpp recreation

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    69b132f View commit details
    Browse the repository at this point in the history

  24. Add i18n make targets: extract_string, translations_compile

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    e4eafd9 View commit details
    Browse the repository at this point in the history

  25. Search for Gettext; Some rules optimizations;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    cb85665 View commit details
    Browse the repository at this point in the history

  26. Exclude chkjson from ALL; Add tests target for json_verifier;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    6024c65 View commit details
    Browse the repository at this point in the history

  27. Reoganize; Rename tests tartet to check_lua; Add check_json;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    00876e0 View commit details
    Browse the repository at this point in the history

  28. Allow build curses and tiles wersions at the same time

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    5c48a28 View commit details
    Browse the repository at this point in the history

  29. Update debug definitions; Update FindCurses to find NCURSES and WIDE;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    f846cbb View commit details
    Browse the repository at this point in the history

  30. Rename cmake to CMakeModules

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    646f6be View commit details
    Browse the repository at this point in the history

  31. Rework generation catabindings.cpp process

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    763eb24 View commit details
    Browse the repository at this point in the history

  32. Rework src/version.h generation

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    10ed76a View commit details
    Browse the repository at this point in the history

  33. Revert path_info.cpp changes

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    bdec6c3 View commit details
    Browse the repository at this point in the history

  34. Create binaries in source tree; Add LUA defenitions; Cleanup;

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    ee8e7b7 View commit details
    Browse the repository at this point in the history

  35. Correct dev-build path info

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    cacaac6 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'improved_build_system' of github.com:brezerk/Cataclysm-… 

    …DDA into improved_build_system
    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    e5da96f View commit details
    Browse the repository at this point in the history

  37. Fixup locale install directory

    @brezerk
    brezerk committed Apr 13, 2015
    Copy the full SHA
    4294a34 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2015

  1. Merge remote-tracking branch 'upstream/master' into improved_build_sy… 

    …stem
    @brezerk
    brezerk committed Apr 14, 2015
    Copy the full SHA
    85a2643 View commit details
    Browse the repository at this point in the history

  2. zlev-option: Remove ZLEVELS cmake build option

    @brezerk
    brezerk committed Apr 14, 2015
    Copy the full SHA
    ef52af2 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. Merge remote-tracking branch 'upstream/master' into improved_build_sy… 

    …stem
    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    a5b0538 View commit details
    Browse the repository at this point in the history

  2. Apply macrosblackd's patch for Windows support for CMake rules

    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    e812b71 View commit details
    Browse the repository at this point in the history

  3. Add Libintl search; Unblock LOCALIZE for WIN target; Port definitions… 

    … from Makefile;
    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    068393d View commit details
    Browse the repository at this point in the history

  4. Re enable DEBUG symbols

    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    47f543c View commit details
    Browse the repository at this point in the history

  5. Add Windows install target; Fixup MinGW #2250 bug with -Os;

    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    93de56b View commit details
    Browse the repository at this point in the history

  6. Remove CMAKE_EXE_LINKER_FLAGS for WIN32 since it duplicates add_execu… 

    …table(WIN32);
    @brezerk
    brezerk committed Apr 22, 2015
    Copy the full SHA
    62e95bc View commit details
    Browse the repository at this point in the history

  7. Update win32 static target

    @brezerk
    brezerk committed Apr 22, 2015
    3
    Copy the full SHA
    66f501c View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. Fixup win32 static link order; add freetype and iconv search and link;

    @brezerk
    brezerk committed Apr 23, 2015
    Copy the full SHA
    85b53ea View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. Add GIT_BINARY option; Fix options layout a bit;

    @brezerk
    brezerk committed Apr 24, 2015
    Copy the full SHA
    cb95c62 View commit details
    Browse the repository at this point in the history

  2. Add RC compiltaions for win32 target

    @brezerk
    brezerk committed Apr 24, 2015
    Copy the full SHA
    f3d7e6d View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2015

  1. Play around static build

    @brezerk
    brezerk committed Apr 27, 2015
    Copy the full SHA
    a36a9d0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into improved_build_sy… 

    …stem
    @brezerk
    brezerk committed Apr 27, 2015
    Copy the full SHA
    5e6c62e View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2015

  1. Remove mingw dll dependency for ncurses version

    @brezerk
    brezerk committed Apr 30, 2015
    Copy the full SHA
    8313453 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. Add uninstall target; Rework win32 static compiltaion; Add shared lib… 

    …s install for win32 (dev only);
    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    7e21d12 View commit details
    Browse the repository at this point in the history

  2. Add uninstall target;

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    081a2d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into improved_build_system

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    9841cbd View commit details
    Browse the repository at this point in the history

  4. Libintl\Iconv does not needed for Linux build; Remove src/moraledata.… 

    …h from CATACLYSM_DDA_HEADERS;
    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    c6fa735 View commit details
    Browse the repository at this point in the history

  5. Add INSTALL file

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    1cc377d View commit details
    Browse the repository at this point in the history

  6. Update INSTALL file

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    ca8ee4f View commit details
    Browse the repository at this point in the history

  7. Rework pthread detection; Add missing pthread link logic for cataclys… 

    …m-tiles
    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    74c6adb View commit details
    Browse the repository at this point in the history

  8. Update MSYS info fo x86_64

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    fce5428 View commit details
    Browse the repository at this point in the history

  9. Add .txt extension to INSTALL file

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    0b83d7c View commit details
    Browse the repository at this point in the history

  10. Update INSTALL.txt

    @brezerk
    brezerk committed May 5, 2015
    Copy the full SHA
    77455fc View commit details
    Browse the repository at this point in the history

Commits on May 6, 2015

  1. Move INSTALL.txt -> COMPILING-CMAKE.md; Change to markdown syntax;

    @brezerk
    brezerk committed May 6, 2015
    Copy the full SHA
    77b13c5 View commit details
    Browse the repository at this point in the history

  2. COMPILING-CMAKE.md: update Makrdown format

    @brezerk
    brezerk committed May 6, 2015
    Copy the full SHA
    699546b View commit details
    Browse the repository at this point in the history

  3. COMPILING-CMAKE.md: update Makrdown format (part2)

    @brezerk
    brezerk committed May 6, 2015
    Copy the full SHA
    1912b01 View commit details
    Browse the repository at this point in the history

  4. COMPILING-CMAKE.md: add missing cmake build options descriptions

    @brezerk
    brezerk committed May 6, 2015
    Copy the full SHA
    d62b9aa View commit details
    Browse the repository at this point in the history

Commits on May 8, 2015

  1. Do not set -DPREFIX in case of WIN32 build

    @brezerk
    brezerk committed May 8, 2015
    Copy the full SHA
    6d0678c View commit details
    Browse the repository at this point in the history

  2. COMPILING-CMAKE.md: Update info for MSYS2 build

    @brezerk
    brezerk committed May 8, 2015
    Copy the full SHA
    2cd2c05 View commit details
    Browse the repository at this point in the history