You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

57 lines
2.1 KiB

Index: CMake/allexec2man.sh
--- CMake/allexec2man.sh.orig 2017-08-26 02:08:44.000000000 +0200
+++ CMake/allexec2man.sh 2018-01-14 17:50:53.395939000 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Convert all of the executables in this directory that are not tests to man
# pages in the given directory.
Index: CMakeLists.txt
--- CMakeLists.txt.orig 2017-08-26 02:08:44.000000000 +0200
+++ CMakeLists.txt 2018-01-14 23:03:34.920679000 +0100
@@ -45,14 +45,6 @@
# This is as of yet unused.
#option(PGO "Use profile-guided optimization if not a debug build" ON)
-# Set the CFLAGS and CXXFLAGS depending on the options the user specified.
-# Only GCC-like compilers support -Wextra, and other compilers give tons of
-# output for -Wall, so only -Wall and -Wextra on GCC.
-if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -ftemplate-depth=1000")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
-endif()
-
# These support libraries are used if we need to link against something
# specific. This list is a subset of MLPACK_LIBRARIES.
set(COMPILER_SUPPORT_LIBRARIES "")
@@ -257,6 +249,9 @@
# Piggyback LAPACK and BLAS linking into Armadillo link.
set(ARMADILLO_LIBRARIES
${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})
+else ()
+ set(ARMADILLO_LIBRARIES
+ ${ARMADILLO_LIBRARIES} -llapack -llapack_blas -lgfortran -lquadmath)
endif ()
# Include directories for the previous dependencies.
@@ -445,7 +440,7 @@
add_custom_target(man ALL
${CMAKE_CURRENT_SOURCE_DIR}/CMake/allexec2man.sh
${CMAKE_CURRENT_SOURCE_DIR}/CMake/exec2man.sh
- ${CMAKE_BINARY_DIR}/share/man
+ ${CMAKE_BINARY_DIR}/man
WORKING_DIRECTORY
${CMAKE_BINARY_DIR}/bin
DEPENDS
@@ -489,8 +484,8 @@
)
# Set the rules to install the documentation.
- install(DIRECTORY ${CMAKE_BINARY_DIR}/share/man/
- DESTINATION share/man/man1/)
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/man/
+ DESTINATION man/man1/)
endif ()
endif ()