File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -90,8 +90,7 @@ if (DO_EXAMPLES OR DO_TESTS AND NOT GRAPHICSMAGICK)
90
90
endif (DO_EXAMPLES OR DO_TESTS AND NOT GRAPHICSMAGICK )
91
91
92
92
# Find latex and dvips for LaTeX integration
93
- find_program (LATEX latex )
94
- find_program (DVIPS dvips )
93
+ find_package (LATEX COMPONENTS DVIPS )
95
94
96
95
# Add subdirectories
97
96
add_subdirectory (src )
Original file line number Diff line number Diff line change @@ -94,9 +94,9 @@ foreach (skip_test GMT_-U.sh GMT_encoding.sh gen_data_App_O.sh gen_data_dummy.sh
94
94
endforeach ()
95
95
96
96
# Remove GMT_latex.sh if latex or dvips not found
97
- if (NOT LATEX OR NOT DVIPS )
97
+ if (NOT LATEX_FOUND )
98
98
list (REMOVE_ITEM _scripts_tests doc /scripts/GMT_latex.sh doc /scripts/GMT_slope2intensity.sh doc /scripts/GMT_seamount_density.sh )
99
- endif (NOT LATEX OR NOT DVIPS )
99
+ endif (NOT LATEX_FOUND )
100
100
101
101
if (DO_TESTS AND BASH )
102
102
foreach (_job ${_scripts_tests} )
Original file line number Diff line number Diff line change @@ -40,9 +40,9 @@ if (DO_TESTS)
40
40
endif (NOT DO_SUPPLEMENT_TESTS )
41
41
42
42
# Remove latex-specific tests if latex or dvips not found
43
- if (NOT LATEX OR NOT DVIPS )
43
+ if (NOT LATEX_FOUND )
44
44
list (REMOVE_ITEM GMT_TEST_DIRS latex )
45
- endif (NOT LATEX OR NOT DVIPS )
45
+ endif (NOT LATEX_FOUND )
46
46
47
47
# export HAVE_GMT_DEBUG_SYMBOLS
48
48
get_directory_property (_dir_defs COMPILE_DEFINITIONS )
You can’t perform that action at this time.
0 commit comments