Merge topic 'minor-cleanups'
884fb7f
Remove obsolete workaround for old cmake versions.5d1fc19
Help: Ensure that target-policies are added to the documentation.efc43cd
Help: Fix some erroneous code block markers in Module docs.
This commit is contained in:
commit
afbac9f2d8
|
@ -589,14 +589,3 @@ install(
|
|||
|
||||
# Install auxiliary files integrating with other tools.
|
||||
add_subdirectory(Auxiliary)
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
# End of the main section of the CMakeLists file
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
# As a special case when building CMake itself, CMake 2.8.0 and below
|
||||
# look up EXECUTABLE_OUTPUT_PATH in the top-level CMakeLists.txt file
|
||||
# to compute the location of the "cmake" executable. We set it here
|
||||
# so that those CMake versions can find it. We wait until after all
|
||||
# the add_subdirectory() calls to avoid affecting the subdirectories.
|
||||
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
|
||||
|
|
|
@ -2,15 +2,10 @@
|
|||
# CMakeExpandImportedTargets
|
||||
# --------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
# CMAKE_EXPAND_IMPORTED_TARGETS(<var> LIBRARIES lib1 lib2...libN
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# [CONFIGURATION <config>] )
|
||||
#
|
||||
#
|
||||
# CMAKE_EXPAND_IMPORTED_TARGETS(<var> LIBRARIES lib1 lib2...libN
|
||||
# [CONFIGURATION <config>])
|
||||
#
|
||||
# CMAKE_EXPAND_IMPORTED_TARGETS() takes a list of libraries and replaces
|
||||
# all imported targets contained in this list with their actual file
|
||||
|
|
|
@ -4,22 +4,15 @@
|
|||
#
|
||||
# Convenience macros for printing properties and variables, useful e.g. for debugging.
|
||||
#
|
||||
#
|
||||
#
|
||||
#
|
||||
#
|
||||
# CMAKE_PRINT_PROPERTIES([TARGETS target1 .. targetN]
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# CMAKE_PRINT_PROPERTIES([TARGETS target1 .. targetN]
|
||||
# [SOURCES source1 .. sourceN]
|
||||
# [DIRECTORIES dir1 .. dirN]
|
||||
# [TESTS test1 .. testN]
|
||||
# [CACHE_ENTRIES entry1 .. entryN]
|
||||
# PROPERTIES prop1 .. propN )
|
||||
#
|
||||
#
|
||||
#
|
||||
# This macro prints the values of the properties of the given targets,
|
||||
# source files, directories, tests or cache entries. Exactly one of the
|
||||
# scope keywords must be used. Example:
|
||||
|
|
|
@ -4,13 +4,10 @@
|
|||
#
|
||||
# Check if the given struct or class has the specified member variable
|
||||
#
|
||||
# CHECK_STRUCT_HAS_MEMBER (<struct> <member> <header> <variable>
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# [LANGUAGE <language>])
|
||||
#
|
||||
#
|
||||
# CHECK_STRUCT_HAS_MEMBER(<struct> <member> <header> <variable>
|
||||
# [LANGUAGE <language>])
|
||||
#
|
||||
# ::
|
||||
#
|
||||
|
|
|
@ -8,19 +8,16 @@
|
|||
# FindJava.cmake has already been loaded. See FindJava.cmake for
|
||||
# information on how to load Java into your CMake project.
|
||||
#
|
||||
# add_jar(target_name
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# add_jar(target_name
|
||||
# [SOURCES] source1 [source2 ...] [resource1 ...]
|
||||
# [INCLUDE_JARS jar1 [jar2 ...]]
|
||||
# [ENTRY_POINT entry]
|
||||
# [VERSION version]
|
||||
# [OUTPUT_NAME name]
|
||||
# [OUTPUT_DIR dir]
|
||||
# )
|
||||
#
|
||||
#
|
||||
# )
|
||||
#
|
||||
# This command creates a <target_name>.jar. It compiles the given
|
||||
# source files (source) and adds the given resource files (resource) to
|
||||
|
@ -189,19 +186,14 @@
|
|||
# CLASS_DIR The directory where the class files can be found. For
|
||||
# example to use them with javah.
|
||||
#
|
||||
#
|
||||
#
|
||||
# find_jar(<VAR>
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# find_jar(<VAR>
|
||||
# name | NAMES name1 [name2 ...]
|
||||
# [PATHS path1 [path2 ... ENV var]]
|
||||
# [VERSIONS version1 [version2]]
|
||||
# [DOC "cache documentation string"]
|
||||
# )
|
||||
#
|
||||
#
|
||||
# )
|
||||
#
|
||||
# This command is used to find a full path to the named jar. A cache
|
||||
# entry named by <VAR> is created to stor the result of this command.
|
||||
|
@ -216,21 +208,24 @@
|
|||
# the VERSIONS argument. The argument after DOC will be used for the
|
||||
# documentation string in the cache.
|
||||
#
|
||||
# install_jar(TARGET_NAME DESTINATION)
|
||||
# ::
|
||||
#
|
||||
# install_jar(TARGET_NAME DESTINATION)
|
||||
#
|
||||
# This command installs the TARGET_NAME files to the given DESTINATION.
|
||||
# It should be called in the same scope as add_jar() or it will fail.
|
||||
#
|
||||
# install_jni_symlink(TARGET_NAME DESTINATION)
|
||||
# ::
|
||||
#
|
||||
# install_jni_symlink(TARGET_NAME DESTINATION)
|
||||
#
|
||||
# This command installs the TARGET_NAME JNI symlinks to the given
|
||||
# DESTINATION. It should be called in the same scope as add_jar() or it
|
||||
# will fail.
|
||||
#
|
||||
# create_javadoc(<VAR>
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# create_javadoc(<VAR>
|
||||
# PACKAGES pkg1 [pkg2 ...]
|
||||
# [SOURCEPATH <sourcepath>]
|
||||
# [CLASSPATH <classpath>]
|
||||
|
@ -240,9 +235,7 @@
|
|||
# [AUTHOR TRUE|FALSE]
|
||||
# [USE TRUE|FALSE]
|
||||
# [VERSION TRUE|FALSE]
|
||||
# )
|
||||
#
|
||||
#
|
||||
# )
|
||||
#
|
||||
# Create java documentation based on files or packages. For more
|
||||
# details please read the javadoc manpage.
|
||||
|
|
|
@ -22,11 +22,9 @@
|
|||
# swig generated module (swig -outdir option) The name-specific variable
|
||||
# SWIG_MODULE_<name>_EXTRA_DEPS may be used to specify extra
|
||||
# dependencies for the generated modules. If the source file generated
|
||||
# by swig need some special flag you can use
|
||||
# set_source_files_properties( ${swig_generated_file_fullname}
|
||||
#
|
||||
# ::
|
||||
# by swig need some special flag you can use::
|
||||
#
|
||||
# set_source_files_properties( ${swig_generated_file_fullname}
|
||||
# PROPERTIES COMPILE_FLAGS "-bla")
|
||||
|
||||
|
||||
|
|
|
@ -11,3 +11,8 @@
|
|||
\* CMP0020
|
||||
\* CMP0021
|
||||
\* CMP0022
|
||||
\* CMP0041
|
||||
\* CMP0042
|
||||
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
|
|
Loading…
Reference in New Issue