mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-14 05:44:56 +00:00
Code Issues Releases Wiki Activity

Fix target pdfmanual when using ninja

Browse Source 
Fix instructions in Macports, add instructions for Homebrew
This commit is contained in:
Carles Fernandez 2020-01-21 00:31:50 +01:00
parent 492a1185ff
commit 545267283a
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -2179,6 +2179,21 @@ if(DOXYGEN_FOUND)
set(HAVE_DOT ${DOXYGEN_DOT_FOUND}) set(HAVE_DOT ${DOXYGEN_DOT_FOUND})
file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir) file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir)
file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir) file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir)
set(PDFMANUAL_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
if(PDFMANUAL_MAKE_PROGRAM MATCHES "ninja")
find_program(PDFMANUAL_MAKE_EXECUTABLE make
PATHS
/usr/bin
/usr/local/bin
)
if(NOT PDFMANUAL_MAKE_EXECUTABLE)
if(PDFLATEX_COMPILER)
message(STATUS "Warning: make is required to build the PDF manual, so target pdfmanual will not be generated.")
endif()
set(PDFLATEX_COMPILER FALSE)
endif()
set(PDFMANUAL_MAKE_PROGRAM ${PDFMANUAL_MAKE_EXECUTABLE})
endif()
if(PDFLATEX_COMPILER) if(PDFLATEX_COMPILER)
set(GENERATE_PDF_DOCUMENTATION "YES") set(GENERATE_PDF_DOCUMENTATION "YES")
set(GNSSSDR_USE_MATHJAX "NO") set(GNSSSDR_USE_MATHJAX "NO")
@ -2193,17 +2208,17 @@ if(DOXYGEN_FOUND)
add_custom_target(doc add_custom_target(doc
${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Generating source code documentation with Doxygen." VERBATIM COMMENT "Generating HTML documentation from source code with Doxygen..." VERBATIM
) )
if(PDFLATEX_COMPILER) if(PDFLATEX_COMPILER)
message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf") message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf")
add_custom_target(pdfmanual add_custom_target(pdfmanual
COMMAND ${CMAKE_MAKE_PROGRAM} COMMAND ${PDFMANUAL_MAKE_PROGRAM}
COMMAND ${CMAKE_COMMAND} -E copy refman.pdf ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf COMMAND ${CMAKE_COMMAND} -E copy refman.pdf ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
COMMAND ${CMAKE_MAKE_PROGRAM} clean COMMAND ${PDFMANUAL_MAKE_PROGRAM} clean
DEPENDS doc DEPENDS doc
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs/latex WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs/latex
COMMENT "Generating PDF manual with Doxygen." VERBATIM COMMENT "Generating PDF manual with LaTeX and pdflatex..." VERBATIM
) )
endif() endif()
message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.") message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.")
@ -2225,7 +2240,8 @@ else()
endif() endif()
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
message(STATUS " or simply by doing 'sudo port install doxygen +latex'.") message(STATUS " or simply by doing 'sudo port install doxygen +docs', if you are using Macports,")
message(STATUS " or 'brew cask install mactex', then restart Terminal and do 'brew install graphviz doxygen', if you use Homebrew.")
endif() endif()
endif() endif()

32
README.md
View File

@ -596,20 +596,12 @@ In a terminal, type:
~~~~~~ ~~~~~~
$ sudo port selfupdate $ sudo port selfupdate
$ sudo port upgrade outdated $ sudo port upgrade outdated
$ sudo port install pkgconfig $ sudo port install armadillo cmake gnuradio gnutls lapack libad9361-iio libiio \
$ sudo port install gnuradio matio pkgconfig protobuf3-cpp pugixml
$ sudo port install lapack
$ sudo port install armadillo
$ sudo port install gnutls
$ sudo port install google-glog +gflags $ sudo port install google-glog +gflags
$ sudo port install matio $ sudo port install doxygen +docs
$ sudo port install pugixml
$ sudo port install protobuf3-cpp
$ sudo port install libiio
$ sudo port install libad9361-iio
$ sudo port install py37-mako $ sudo port install py37-mako
$ sudo port install py37-six $ sudo port install py37-six
$ sudo port install doxygen +docs
~~~~~~ ~~~~~~
You also might need to activate a Python installation. The list of installed versions can be retrieved with: You also might need to activate a Python installation. The list of installed versions can be retrieved with:
@ -644,21 +636,13 @@ $ sudo python3 get-pip.py
Install the required dependencies: Install the required dependencies:
~~~~~~ ~~~~~~
$ brew install cmake $ brew update && brew upgrade
$ brew install pkg-config $ brew install armadillo cmake hdf5 gflags glog gnuradio lapack libmatio log4cpp \
$ brew install hdf5 openssl pkg-config protobuf pugixml
$ brew install lapack
$ brew install armadillo
$ brew install gflags
$ brew install glog
$ brew install gnuradio
$ brew install libmatio
$ brew install log4cpp
$ brew install openssl
$ brew install pugixml
$ brew install protobuf
$ pip3 install mako $ pip3 install mako
$ pip3 install six $ pip3 install six
$ brew cask install mactex # when completed, restart Terminal
$ brew install graphviz doxygen
~~~~~~ ~~~~~~