diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackNuGet.cmake | 4 | ||||
| -rw-r--r-- | Modules/Compiler/GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/TI-C.cmake | 6 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 | ||||
| -rw-r--r-- | Modules/Platform/Linux-GNU.cmake | 1 |
5 files changed, 14 insertions, 7 deletions
diff --git a/Modules/CPackNuGet.cmake b/Modules/CPackNuGet.cmake index 9c36634..05403bc 100644 --- a/Modules/CPackNuGet.cmake +++ b/Modules/CPackNuGet.cmake @@ -63,8 +63,8 @@ List of CPackNuGet specific variables: - ``CPACK_COMPONENT_GROUP_<groupName>_DESCRIPTION``, - :variable:`CPACK_PACKAGE_DESCRIPTION` - .. variable:: CPACK_NUGET_PACKAGE_AUTHORS - CPACK_NUGET_<compName>_PACKAGE_AUTHORS +.. variable:: CPACK_NUGET_PACKAGE_AUTHORS + CPACK_NUGET_<compName>_PACKAGE_AUTHORS A comma-separated list of packages authors, matching the profile names on nuget.org_. These are displayed in the NuGet Gallery on diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index d962688..a3ef2bc 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -86,4 +86,6 @@ macro(__compiler_gnu lang) "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>" ) endif() + + set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}" "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp") endmacro() diff --git a/Modules/Compiler/TI-C.cmake b/Modules/Compiler/TI-C.cmake index e149237..1c0f4bc 100644 --- a/Modules/Compiler/TI-C.cmake +++ b/Modules/Compiler/TI-C.cmake @@ -2,6 +2,12 @@ set(CMAKE_LIBRARY_PATH_FLAG "--search_path=") set(CMAKE_LINK_LIBRARY_FLAG "--library=") set(CMAKE_INCLUDE_FLAG_C "--include_path=") +set(CMAKE_C90_STANDARD_COMPILE_OPTION "--c89") +set(CMAKE_C90_EXTENSION_COMPILE_OPTION "--c89 --relaxed_ansi") + +set(CMAKE_C99_STANDARD_COMPILE_OPTION "--c99") +set(CMAKE_C99_EXTENSION_COMPILE_OPTION "--c99 --relaxed_ansi") + set(CMAKE_DEPFILE_FLAGS_C "--preproc_with_compile --preproc_dependency=<DEPFILE>") set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> --compile_only --skip_assembler --c_file=<SOURCE> <DEFINES> <INCLUDES> <FLAGS> --output_file=<ASSEMBLY_SOURCE>") diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index db19691..0c5b33f 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -133,9 +133,9 @@ External Project Definition is determined by inspecting the actual content rather than using logic based on the file extension. - ``URL_HASH ALGO=<value>`` - Hash of the archive file to be downloaded. The ``<value>`` should be of - the form ``algo=hashValue`` where ``algo`` can be any of the hashing + ``URL_HASH <algo>=<hashValue>`` + Hash of the archive file to be downloaded. The argument should be of + the form ``<algo>=<hashValue>`` where ``algo`` can be any of the hashing algorithms supported by the :command:`file()` command. Specifying this option is strongly recommended for URL downloads, as it ensures the integrity of the downloaded content. It is also used as a check for a @@ -1686,7 +1686,7 @@ function(_ep_command_line_to_initial_cache var args force) foreach(line ${args}) if("${line}" MATCHES "^-D(.*)") set(line "${CMAKE_MATCH_1}") - if(setArg) + if(NOT "${setArg}" STREQUAL "") # This is required to build up lists in variables, or complete an entry string(APPEND setArg "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})") string(APPEND script_initial_cache "\n${setArg}") diff --git a/Modules/Platform/Linux-GNU.cmake b/Modules/Platform/Linux-GNU.cmake index ce30a26..6878254 100644 --- a/Modules/Platform/Linux-GNU.cmake +++ b/Modules/Platform/Linux-GNU.cmake @@ -12,5 +12,4 @@ macro(__linux_compiler_gnu lang) # We pass this for historical reasons. Projects may have # executables that use dlopen but do not set ENABLE_EXPORTS. set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-rdynamic") - set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}" "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp") endmacro() |