[Cmake-commits] CMake branch, next, updated. v3.1.0-1750-g9f45398
Brad King
brad.king at kitware.com
Sun Jan 11 15:42:56 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 9f453984d4ec1537e9a75b8034a682e651b3b9c8 (commit)
via 89e08de8c2e7833461032c9309e1a6416ba35438 (commit)
via c32f691944b6b7629de7e6c1366d269a6b54fd8d (commit)
via 222ee2c05932489f6b5879e423c3f07fd7f67996 (commit)
from 2e978198af1bfa1f32849047bb7c792206fb5208 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f453984d4ec1537e9a75b8034a682e651b3b9c8
commit 9f453984d4ec1537e9a75b8034a682e651b3b9c8
Merge: 2e97819 89e08de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 15:42:55 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 15:42:55 2015 -0500
Merge topic 'FindLATEX-components' into next
89e08de8 FindLATEX: Add components for XeLaTeX and LuaLaTeX
c32f6919 FindLATEX: Add components Biber and xindy
222ee2c0 FindLATEX: Add components PDFtoPS and HTLATEX
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89e08de8c2e7833461032c9309e1a6416ba35438
commit 89e08de8c2e7833461032c9309e1a6416ba35438
Author: Christoph Grüninger <gruenich at dune-project.org>
AuthorDate: Sat Jan 10 14:48:31 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 15:42:12 2015 -0500
FindLATEX: Add components for XeLaTeX and LuaLaTeX
diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake
index 96acbb9..ae83733 100644
--- a/Modules/FindLATEX.cmake
+++ b/Modules/FindLATEX.cmake
@@ -14,6 +14,8 @@
# LATEX_<component>_FOUND: whether found <component>
# LATEX_COMPILER: path to the LaTeX compiler
# PDFLATEX_COMPILER: path to the PdfLaTeX compiler
+# XELATEX_COMPILER: path to the XeLaTeX compiler
+# LUALATEX_COMPILER: path to the LuaLaTeX compiler
# BIBTEX_COMPILER: path to the BibTeX compiler
# BIBER_COMPILER: path to the Biber compiler
# MAKEINDEX_COMPILER: path to the MakeIndex compiler
@@ -28,6 +30,8 @@
# Possible components are::
#
# PDFLATEX
+# XELATEX
+# LUALATEX
# BIBTEX
# BIBER
# MAKEINDEX
@@ -46,7 +50,8 @@
# find_package(LATEX COMPONENTS BIBTEX PS2PDF)
#=============================================================================
-# Copyright 2002-2014 Kitware, Inc.
+# Copyright 2002-2015 Kitware, Inc.
+# Copyright 2014-2015 Christoph Grüninger <foss at grueninger.de>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -109,6 +114,30 @@ else()
set(LATEX_PDFLATEX_FOUND FALSE)
endif()
+# find xelatex
+find_program(XELATEX_COMPILER
+ NAMES xelatex
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (XELATEX_COMPILER)
+ set(LATEX_XELATEX_FOUND TRUE)
+else()
+ set(LATEX_XELATEX_FOUND FALSE)
+endif()
+
+# find lualatex
+find_program(LUALATEX_COMPILER
+ NAMES lualatex
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (LUALATEX_COMPILER)
+ set(LATEX_LUALATEX_FOUND TRUE)
+else()
+ set(LATEX_LUALATEX_FOUND FALSE)
+endif()
+
# find bibtex
find_program(BIBTEX_COMPILER
NAMES bibtex
@@ -239,6 +268,8 @@ endif()
mark_as_advanced(
LATEX_COMPILER
PDFLATEX_COMPILER
+ XELATEX_COMPILER
+ LUALATEX_COMPILER
BIBTEX_COMPILER
BIBER_COMPILER
MAKEINDEX_COMPILER
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c32f691944b6b7629de7e6c1366d269a6b54fd8d
commit c32f691944b6b7629de7e6c1366d269a6b54fd8d
Author: Christoph Grüninger <gruenich at dune-project.org>
AuthorDate: Sat Jan 10 12:10:03 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 15:41:37 2015 -0500
FindLATEX: Add components Biber and xindy
diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake
index 34a4402..96acbb9 100644
--- a/Modules/FindLATEX.cmake
+++ b/Modules/FindLATEX.cmake
@@ -15,7 +15,9 @@
# LATEX_COMPILER: path to the LaTeX compiler
# PDFLATEX_COMPILER: path to the PdfLaTeX compiler
# BIBTEX_COMPILER: path to the BibTeX compiler
+# BIBER_COMPILER: path to the Biber compiler
# MAKEINDEX_COMPILER: path to the MakeIndex compiler
+# XINDY_COMPILER: path to the xindy compiler
# DVIPS_CONVERTER: path to the DVIPS converter
# DVIPDF_CONVERTER: path to the DVIPDF converter
# PS2PDF_CONVERTER: path to the PS2PDF converter
@@ -27,7 +29,9 @@
#
# PDFLATEX
# BIBTEX
+# BIBER
# MAKEINDEX
+# XINDY
# DVIPS
# DVIPDF
# PS2PDF
@@ -117,6 +121,18 @@ else()
set(LATEX_BIBTEX_FOUND FALSE)
endif()
+# find biber
+find_program(BIBER_COMPILER
+ NAMES biber
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (BIBER_COMPILER)
+ set(LATEX_BIBER_FOUND TRUE)
+else()
+ set(LATEX_BIBER_FOUND FALSE)
+endif()
+
# find makeindex
find_program(MAKEINDEX_COMPILER
NAMES makeindex
@@ -129,6 +145,18 @@ else()
set(LATEX_MAKEINDEX_FOUND FALSE)
endif()
+# find xindy
+find_program(XINDY_COMPILER
+ NAMES xindy
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (XINDY_COMPILER)
+ set(LATEX_XINDY_FOUND TRUE)
+else()
+ set(LATEX_XINDY_FOUND FALSE)
+endif()
+
# find dvips
find_program(DVIPS_CONVERTER
NAMES dvips
@@ -212,7 +240,9 @@ mark_as_advanced(
LATEX_COMPILER
PDFLATEX_COMPILER
BIBTEX_COMPILER
+ BIBER_COMPILER
MAKEINDEX_COMPILER
+ XINDY_COMPILER
DVIPS_CONVERTER
DVIPDF_CONVERTER
PS2PDF_CONVERTER
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=222ee2c05932489f6b5879e423c3f07fd7f67996
commit 222ee2c05932489f6b5879e423c3f07fd7f67996
Author: Christoph Grüninger <gruenich at dune-project.org>
AuthorDate: Sat Jan 10 10:56:35 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 15:41:06 2015 -0500
FindLATEX: Add components PDFtoPS and HTLATEX
diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake
index db4902f..34a4402 100644
--- a/Modules/FindLATEX.cmake
+++ b/Modules/FindLATEX.cmake
@@ -19,7 +19,9 @@
# DVIPS_CONVERTER: path to the DVIPS converter
# DVIPDF_CONVERTER: path to the DVIPDF converter
# PS2PDF_CONVERTER: path to the PS2PDF converter
+# PDFTOPS_CONVERTER: path to the pdftops converter
# LATEX2HTML_CONVERTER: path to the LaTeX2Html converter
+# HTLATEX_COMPILER: path to the htlatex compiler
#
# Possible components are::
#
@@ -29,7 +31,9 @@
# DVIPS
# DVIPDF
# PS2PDF
+# PDFTOPS
# LATEX2HTML
+# HTLATEX
#
# Example Usages::
#
@@ -167,6 +171,18 @@ else()
set(LATEX_PS2PDF_FOUND FALSE)
endif()
+# find pdftops
+find_program(PDFTOPS_CONVERTER
+ NAMES pdftops
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (PDFTOPS_CONVERTER)
+ set(LATEX_PDFTOPS_FOUND TRUE)
+else()
+ set(LATEX_PDFTOPS_FOUND FALSE)
+endif()
+
# find latex2html
find_program(LATEX2HTML_CONVERTER
NAMES latex2html
@@ -179,6 +195,18 @@ else()
set(LATEX_LATEX2HTML_FOUND FALSE)
endif()
+# find htlatex
+find_program(HTLATEX_COMPILER
+ NAMES htlatex
+ PATHS ${MIKTEX_BINARY_PATH}
+ /usr/bin
+)
+if (HTLATEX_COMPILER)
+ set(LATEX_HTLATEX_FOUND TRUE)
+else()
+ set(LATEX_HTLATEX_FOUND FALSE)
+endif()
+
mark_as_advanced(
LATEX_COMPILER
@@ -188,7 +216,9 @@ mark_as_advanced(
DVIPS_CONVERTER
DVIPDF_CONVERTER
PS2PDF_CONVERTER
+ PDFTOPS_CONVERTER
LATEX2HTML_CONVERTER
+ HTLATEX_COMPILER
)
# handle variables for found Latex and its components
-----------------------------------------------------------------------
Summary of changes:
Modules/FindLATEX.cmake | 93 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 92 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list