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

Improvements to the build system #4609

Merged
merged 6 commits into from
Feb 17, 2017
Merged

Improvements to the build system #4609

merged 6 commits into from
Feb 17, 2017

Commits on Aug 31, 2016

  1. cmake: fix usage of INCLUDE_DIR/INCLUDE_DIRS in Dependencies.cmake

    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    b9c3c06 View commit details
    Browse the repository at this point in the history

  2. cmake/Templates: properly spell OpenCV CMake config file name

    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    a59e647 View commit details
    Browse the repository at this point in the history

  3. cmake: refactor deps detection, specify all dependencies in the expor… 

    …ted caffe target

This is the first step towards "modern" IMPORTED-targets-only CMake
setup. The find_package modules still need to be rewritten and upstreamed in
form of config exports where possible.
    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    ba189d9 View commit details
    Browse the repository at this point in the history

  4. net.cpp: do not include test/test_caffe_main.hpp

    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    6200b91 View commit details
    Browse the repository at this point in the history

  5. cmake: add option to link with OpenMP 

    Despite Caffe itself does not use OpenMP, explicitly linking to OpenMP
should be done when one statically links to a BLAS library which uses
OpenMP internally and does not provide proper CMake imported targets
with proper dependencies (nobody this so far).
    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    f1b9da5 View commit details
    Browse the repository at this point in the history

  6. cmake/Templates: remove duplicated #cmakedefines from caffe_config.h.in 

    Rationale: these are duplicated in CMakeLists code, and they cannot be
removed from there because many definitions need to be exported to the
library clients. See issue BVLC#4625.
    @intelfx
    intelfx committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    6ed799c View commit details
    Browse the repository at this point in the history