Skip to content
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: ngscopeclient/scopehal-docs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0452f4853b9e
Choose a base ref
...
head repository: ngscopeclient/scopehal-docs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 481e84daec9b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Replace globbed DEPENDS list with an explicit one, so that CMake gene…

    …rators that don't support globbing (eg Ninja) can successfully build docs
    9names committed Jun 22, 2020
    Copy the full SHA
    1d0b9f3 View commit details
  2. Remove manual copying in MinGW in favor of setting a sensible install…

    … prefix, and using make install. Note that this requires the ffts cmake improvements before scopehal can be built like this
    9names committed Jun 22, 2020
    Copy the full SHA
    3bcea2a View commit details
  3. Merge pull request #11 from 9names/simplify_mingw_build_instructions

    Allow building with Ninja, simplify MinGW build instructions
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    481e84d View commit details
Showing with 23 additions and 4 deletions.
  1. +21 −1 CMakeLists.txt
  2. +2 −3 section-gettingstarted.tex
22 changes: 21 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# Not all CMake Generators support file globbing, so build our tex dependency list manually
# We could get CMake to do the glob, but there's not many files to deal with
set(DOC_LIST
glscopeclient-manual.tex
section-decodes.tex
section-drivers.tex
section-gettingstarted.tex
section-history.tex
section-legal.tex
section-mainwindow.tex
section-protoanalyzer.tex
section-revision.tex
section-timeline.tex
section-transports.tex
section-waveformgroups.tex
section-waveformviews.tex
)
# Save ourselves from having to manually paste this in front of every filename
list(TRANSFORM DOC_LIST PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/)

add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glscopeclient-manual.pdf
COMMAND pdflatex -halt-on-error -interaction batchmode
@@ -6,7 +26,7 @@ add_custom_command(
COMMAND pdflatex -halt-on-error -interaction batchmode
--output-directory ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/glscopeclient-manual.tex > /dev/null
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.tex
DEPENDS ${DOC_LIST}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM)
add_custom_target(doc ALL
5 changes: 2 additions & 3 deletions section-gettingstarted.tex
Original file line number Diff line number Diff line change
@@ -111,10 +111,9 @@ \subsubsection{Windows}
cd ffts
mkdir build
cd build
cmake -G"MinGW Makefiles" ../
cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX ..
mingw32-make -j
cp ./libffts_static.a /mingw64/lib/
cp ./../include/ffts.h /mingw64/include/
mingw32-make install
\end{lstlisting}

\item Build scopehal and scopehal-apps