Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e30974b94e2
Choose a base ref
...
head repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6acf808a65dc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Copy the full SHA
    870c12b View commit details
  2. Merge pull request #17 from nshcat/doc-switch

    Added CMake switch to control documentation build
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    6acf808 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 CMakeLists.txt
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.3)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(scopehal-cmake)

set(BUILD_DOCS CACHE BOOL "Build the documentation")

set(WARNINGS "-Wall -Wextra -Wuninitialized ")
set(WARNINGS "${WARNINGS} -Wshadow -Wunsafe-loop-optimizations -Wpedantic -Wcast-align -Wwrite-strings")
set(WARNINGS "${WARNINGS} -Wmissing-declarations -Wvla")
@@ -16,9 +18,7 @@ pkg_check_modules(GLM glm>=0.9.8)
pkg_search_module(GLM REQUIRED glm>=0.9.8)
find_package(FFTS)

# Texlive does not work well in MinGW. Building docs isnt really needed on Windows right now.
# We might find a fix for this in the future.
if(NOT WIN32)
if(BUILD_DOCS)
add_subdirectory("${PROJECT_SOURCE_DIR}/doc")
endif()