Skip to content

Commit

Permalink
Merge pull request #46 from leapmotion/ref-buildautonet
Browse files Browse the repository at this point in the history
Recommend that we build AutoNet by default unconditionally
  • Loading branch information
gtremper committed Aug 14, 2014
2 parents 8a38a58 + 8c05e34 commit 76bdecc
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ endif()

set_property(GLOBAL PROPERTY USE_FOLDERS ON)
include(CMakeModules/pch.cmake)
set(AUTOWIRING_BUILD_AUTONET_DEFAULT ON)

# We don't build tests unless we're being built by ourselves in our own source tree
# When we're embedded in someone else's subtree, it's not likely that they will want
Expand All @@ -40,7 +41,6 @@ get_filename_component(AUTOWIRING_ROOT_DIR . ABSOLUTE)
if(CMAKE_SOURCE_DIR STREQUAL AUTOWIRING_ROOT_DIR)
set(AUTOWIRING_BUILD_TESTS_DEFAULT ON)
set(AUTOWIRING_BUILD_EXAMPLES_DEFAULT ON)
set(AUTOWIRING_BUILD_AUTONET_DEFAULT ON)

# All of our binaries go to one place: The binaries output directory. We only want to tinker
# with this if we're building by ourselves, otherwise we just do whatever the enclosing project
Expand All @@ -49,7 +49,6 @@ if(CMAKE_SOURCE_DIR STREQUAL AUTOWIRING_ROOT_DIR)
else()
set(AUTOWIRING_BUILD_TESTS_DEFAULT OFF)
set(AUTOWIRING_BUILD_EXAMPLES_DEFAULT OFF)
set(AUTOWIRING_BUILD_AUTONET_DEFAULT OFF)
endif()

option(AUTOWIRING_BUILD_TESTS "Build Autowiring unit tests" ${AUTOWIRING_BUILD_TESTS_DEFAULT})
Expand Down

0 comments on commit 76bdecc

Please sign in to comment.