Skip to content

Commit bf99bdf

Browse files
committed
Replace auto-tools instructions with CMake
Signed-off-by: Charlie Gracie <[email protected]>
1 parent 309154d commit bf99bdf

File tree

2 files changed

+26
-38
lines changed

2 files changed

+26
-38
lines changed

Diff for: README.md

+26-35
Original file line numberDiff line numberDiff line change
@@ -153,50 +153,41 @@ look at a 'standalone' build, which hooks Eclipse OMR up to the its testing syst
153153
only.
154154

155155
### Basic configuration and compile
156-
To build standalone Eclipse OMR, run the following commands from the top of the
157-
source tree. The top of the Eclipse OMR source tree is the directory that contains
158-
run_configure.mk.
156+
To build standalone Eclipse OMR, run the following commands from the root of the
157+
source tree. For more detailed instructions please read [BuildingWithCMake.md](doc/BuildingWithCMake.md).
159158

160-
# Generate autotools makefiles with SPEC-specific presets
161-
make -f run_configure.mk SPEC=linux_x86-64 OMRGLUE=./example/glue
159+
# Create a build directory and cd into it
160+
mkdir build
161+
cd build
162+
163+
#generate the build system using cmake
164+
cmake ..
162165

163-
# Build
166+
# Build (you can optionally compile in parallel by adding -j<N> to the make command)
164167
make
165168

166-
# Run tests (note that no contribution should cause new test failures in "make test")
167-
make test
168-
169-
Run `make -f run_configure.mk help` for a list of configure makefile targets.
170-
Run `make help` for a list of build targets.
171-
172-
### Building Eclipse OMR on Windows
173-
A shell script interpreter, such as bash, is required to run configure.
174-
175-
### How to Configure with Custom Options
176-
Run `./configure --help` to see the full list of configure command-line
177-
options.
169+
# Run tests (note that no contribution should cause new test failures in testing).
170+
# Use the `-V` option to see verbose output from the tests.
171+
ctest [-V]
178172

179-
To run configure using both `SPEC` presets and custom options, pass the
180-
`EXTRA_CONFIGURE_ARGS` option to `run_configure.mk`.
173+
### Building Eclipse OMR on Windows using Visual Studio
174+
The following instructions below demonstrate the steps to build Eclipse OMR on Windows
175+
using Visual Studios. In the example Visual Studio 11 2012 Win64 is being used.
176+
You can easily switch this to the version of Visual Studio you would like to use.
181177

182-
For example, to disable optimizations, run configure like this:
178+
# Create a build directory and cd into it
179+
mkdir build
180+
cd build
181+
182+
#generate the build system using cmake
183+
cmake -G "Visual Studio 11 2012 Win64" ..
183184

184-
# Example configure
185-
make -f run_configure.mk SPEC=linux_x86-64 OMRGLUE=./example/glue 'EXTRA_CONFIGURE_ARGS=--disable-optimized' clean all
186-
187-
To disable building fvtests, run configure like this:
188-
189-
# Example configure disabling fvtests
190-
make -f run_configure.mk SPEC=linux_x86-64 OMRGLUE=./example/glue 'EXTRA_CONFIGURE_ARGS=--disable-fvtest' clean all
191-
192-
Note that the `clean` target of `run_configure.mk` deletes the header files and
193-
makefiles generated by configure. Invoking the `clean all` targets ensures that
194-
the header files and makefiles are regenerated using the custom options.
185+
# Build
186+
cmake --build .
195187

196-
The minimal invocation of configure is:
188+
# Run tests (note that no contribution should cause new test failures in "make test")
189+
ctest
197190

198-
# Basic configure example
199-
$ ./configure OMRGLUE=./example/glue
200191

201192
Where can I learn more?
202193
===============================

Diff for: doc/BuildingWithCMake.md

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
2222

2323
# Building with CMake
2424

25-
Development is underway for a new build system using CMake. At this point, the CMake build system is **incomplete and
26-
experimental**.
27-
2825
Normal build instructions are in the main [`README.md`](../README.md).
2926

3027
## Requirements

0 commit comments

Comments
 (0)