Commit Graph

21 Commits

Author SHA1 Message Date
Saleem Abdulrasool
8454cdbe55 Use the new LLVM cmake paths
Update the paths that we look in for the cmake modules from LLVM which changed
recently on SVN trunk.  Check the old paths first, and if that fails, check the
new path.  This permits building against either layout.
2016-02-16 15:15:10 -08:00
Michael Gottesman
6da11cec7b Make sure that even in the standalone build configuration, we can build doxygen documentation.
The issue is that this was originally done when in-tree builds were the
preferred way of building so LLVM_ENABLE_DOXYGEN would be defined and LLVM would
have found doxygen as well. When one is doing the current preferred standalone
install, the option LLVM_ENABLE_DOXYGEN is not discoverable to the user via an
option with a default argument and the doxygen package is never searched for.

This commit ensures that when building standalone:

1. LLVM_ENABLE_DOXYGEN is defined as an option with a default value of FALSE.
2. The cmake dtrace package is searched for and found.

When we are building standalone, we take these values from LLVM.
2016-01-09 21:10:45 -08:00
Lijun Xue
ab6890fa5e Fix typos in comments 2015-12-03 20:44:23 -08:00
John McCall
5203a688f6 Pick up LLVM_PACKAGE_VERSION correctly in unified builds. 2015-11-17 12:33:17 -08:00
Argyrios Kyrtzidis
7c5de8fca5 [CMake] Make sure the standalone build enables the same warnings as the llvm/clang build. 2015-11-05 19:25:43 -08:00
Jordan Rose
6bc2234409 Revert "[cmake] Turn on the -Wbool-conversion flag." (r32925)
I complained about not having this to Michael, but it turns out it's on by
default and just doesn't catch the issue we ran into.

Swift SVN r32931
2015-10-28 01:13:41 +00:00
Michael Gottesman
4b63ffc136 [cmake] Turn on the -Wbool-conversion flag.
This would have caught a problem caused by an upstream source code change in the
merge.

Swift SVN r32925
2015-10-27 23:54:00 +00:00
Argyrios Kyrtzidis
f3b8a5898f [CMake/build-presets] Add 'clang-libclang' install component that installs libclang and pass the clang version via darwin-llvm-submit-version.
rdar://22907181

Swift SVN r32707
2015-10-15 16:52:22 +00:00
Jordan Rose
9f7a750f2a [CMake] Restore code that was previously guarded by "NOT MSVC_IDE".
Swift SVN r31549
2015-08-27 22:48:36 +00:00
Jordan Rose
765fab169a [CMake] Don't pretend to support MSVC.
These might very well be the right things to do, but no one's tested that.

Swift SVN r31537
2015-08-27 18:47:27 +00:00
Dmitri Hrybenko
7cdcb16cc4 CMake: LLVMParseArguments.cmake was removed, migrate to cmake_parse_arguments
Swift SVN r29699
2015-06-25 22:01:37 +00:00
Justin Bogner
b0e7cbd9e0 CMake: Use the USES_TERMINAL option for tests
This allows `ninja check` to display the lit progress bar when using a
new enough cmake+ninja combination, as it does in LLVM these days.

Swift SVN r27923
2015-04-29 21:30:32 +00:00
John McCall
3546d03462 Fix the unified build with cmark. Thanks to David Farler for
pointing out where I needed to look.

Swift SVN r27829
2015-04-27 23:04:13 +00:00
David Farler
ca5876a866 swiftMarkup Library
Replace ReST-flavored documentation comments with Markdown.

rdar://problem/20180412

In addition to full Markdown support, the following extensions are
supported. These appear as lists at the top level of the comment's
"document". All of these extensions are matched without regard to
case.

Parameter Outlines
------------------

- Parameters:
  - x: ...
  - y: ...

Separate Parameters
-------------------

- parameter x: ...
- parameter y: ...

- Note:
Parameter documentation may be broken up across the entire comment,
with a mix of parameter documentation kinds - they'll be consolidated
in the end.

Returns
-------

- returns: ...

The following extensions are also list items at the top level, which
will also appear in Xcode QuickHelp as first-class citizens:

- Attention: ...
- Author: ...
- Authors: ...
- Bug: ...
- Complexity: ...
- Copyright: ...
- Date: ...
- Experiment: ...
- Important: ...
- Invariant: ...
- Note: ...
- Postcondition: ...
- Precondition: ...
- Remark: ...
- Remarks: ...
- See: ...
- Since: ...
- Todo: ...
- Version: ...
- Warning: ...

These match most of the extra fields in Doxygen, plus a few more per request.

Other changes
-------------
- Remove use of rawHTML for all markup AST nodes except for those
not representable by the Xcode QuickHelp XSLT - <h>, <hr/>, and of
course inline/block HTML itself.

- Update the doc comment RNG schema to more accurately reflect Xcode
QuickHelp.

- Clean up cmark CMake configuration.

- Rename "FullComment" to "DocComment"

- Update the Swift Standard Documentation (in a follow-up commit)

- Update SourceKit for minor changes and link against cmark
  (in a follow-up commit).

Swift SVN r27727
2015-04-26 00:07:15 +00:00
Jordan Rose
38752c2d92 [CMake] Move swift_llvm_config to SwiftSharedCMakeConfig (for SourceKit).
...and rename it to swift_common_llvm_config.

This is the function that acts like llvm_config but handles the LLVM build
being a different configuration from the Swift (or SourceKit) build, which
can be problematic for multi-configuration build schemes like Xcode.

There's also one fix here: LLVM dependencies for dylibs weren't being
properly added. (This is the "SHARED_LIBRARY" case near the bottom.)

Swift SVN r26631
2015-03-27 16:36:43 +00:00
Dmitri Hrybenko
27f0e7b46e CMake: adapt to upstream CMake changes
Swift SVN r26604
2015-03-26 22:28:15 +00:00
David Farler
b60613458b cmark Build Support
<rdar://problem/20180372>

Build cmark alongside llvm and clang.
If the clone doesn't exist, build-script-impl will clone it in the
workspace. Also update the README and update-checkout scripts.

Swift SVN r26364
2015-03-20 22:32:19 +00:00
Argyrios Kyrtzidis
7262217319 [CMake] Move the KEYWORD-for-target_link_libraries workaround into SwiftSharedCMakeConfig.cmake
so SourceKit can also automatically use it.

Thanks to Dmitri for the tip!

Swift SVN r25527
2015-02-25 02:53:34 +00:00
Dmitri Hrybenko
fe5d88ad20 CMake: prevent LLVM's CMake files from overriding Swift's assertion
configuration

rdar://19723473 rdar://19722119

Swift SVN r25413
2015-02-20 03:26:02 +00:00
Sonny Falk
6743b8e83c [CMake] Fix unified build
Make sure SWIFT_NATIVE_LLVM_TOOLS_PATH and SWIFT_NATIVE_CLANG_TOOLS_PATH
are set even when not building standalone.

Swift SVN r24726
2015-01-26 06:52:32 +00:00
Sonny Falk
1c63eeee65 [CMake] CMake script refactoring for better code sharing between Swift and SourceKit.
Swift SVN r24713
2015-01-25 01:36:40 +00:00