Skip to content

Commit

Permalink
build system changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nixiz committed Sep 11, 2020
1 parent 376c1e8 commit b572124
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ endif()
# Enable package managers
#

include(cmake/Conan.cmake)
include(cmake/Vcpkg.cmake)
# include(cmake/Conan.cmake)
# include(cmake/Vcpkg.cmake)

#
# Create library, setup header and source files
Expand Down Expand Up @@ -93,7 +93,7 @@ verbose_message("Applied compiler warnings. Using standard ${CXX_STANDARD}.\n")
# Enable Doxygen
#

include(cmake/Doxygen.cmake)
# include(cmake/Doxygen.cmake)

#
# Set the build/user include directories
Expand Down
2 changes: 1 addition & 1 deletion cmake/StandardSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ option(${PROJECT_NAME}_WARNINGS_AS_ERRORS "Treat compiler warnings as errors." O
# Currently supporting: Conan, Vcpkg.

option(${PROJECT_NAME}_ENABLE_CONAN "Enable the Conan package manager for this project." OFF)
option(${PROJECT_NAME}_ENABLE_VCPKG "Enable the Vcpkg package manager for this project." ON)
option(${PROJECT_NAME}_ENABLE_VCPKG "Enable the Vcpkg package manager for this project." OFF)

#
# Unit testing
Expand Down

0 comments on commit b572124

Please sign in to comment.