X-Git-Url: http://plrg.eecs.uci.edu/git/?p=junction.git;a=blobdiff_plain;f=README.md;h=1bf35aceebc94ba2b779e949fd071cf53ff22fdd;hp=0abbc997a22be3b46cc51e06a4765a5d47e30b2a;hb=6ec01ea117c6657e77b5eb36a684b3d2f99bf322;hpb=673a618f0fa0da41cf25897d40edbb0293b4765d;ds=sidebyside

diff --git a/README.md b/README.md
index 0abbc99..1bf35ac 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Junction is a library of concurrent data structures in C++. It contains three ha
     junction::ConcurrentMap_LeapFrog
     junction::ConcurrentMap_Grampa
 
-[CMake](https://cmake.org/) and [Turf](https://github.com/preshing/AcquireRelease) are required. See the blog post [New Concurrent Hash Maps for C++](http://preshing.com/20160201/new-concurrent-hash-maps-for-cpp/) for more information.
+[CMake](https://cmake.org/) and [Turf](https://github.com/preshing/turf) are required. See the blog post [New Concurrent Hash Maps for C++](http://preshing.com/20160201/new-concurrent-hash-maps-for-cpp/) for more information.
 
 ## License
 
@@ -35,7 +35,7 @@ To generate an Xcode project for iOS:
 
 The generated build system will contain separate targets for Junction, Turf, and some sample applications.
 
-[[https://github.com/preshing/junction/docs/vs-solution.png]]
+![Solution Explorer](/docs/vs-solution.png)
 
 Alternatively, you can run CMake on a specific sample only:
 
@@ -58,15 +58,25 @@ Some developers will prefer approach #3, but I encourage you to try approach #1
 
 If your project is already based on CMake, clone the Junction and Turf source trees somewhere, then call `add_subdirectory` on Junction's root folder from your own CMake script. This will add both Junction and Turf targets to your build system.
 
-If you use Git, you can add the Junction and Turf repositories as submodules. Otherwise, you can just copy the Junction and Turf source trees to your repository.
-
-[FIXME: Create a repository with a sample project that demonstrates this.]
+For a simple example, see the [junction-sample](https://github.com/preshing/junction-sample) repository.
 
 ### Building the Libraries Separately
 
 Generate Junction's build system using the steps described in the *Getting Started* section, then use it to build the libraries you need. Add these to your own build system. Make sure to generate static libraries to avoid linking parts of the library that aren't needed.
 
-[FIXME: Use CMake's install feature to generate a clean output tree, so users don't have to fiddle with include and library paths too much.]
+If you build the `install` target provided by Junction's CMake script, the build system will output a clean folder containing only the headers and libs that you need. You can add this to your own project using a single include path. Choose the output directory by specifying the `CMAKE_INSTALL_PREFIX` variable to CMake. Additionally, you can specify `JUNCTION_WITH_SAMPLES=OFF` to avoid building the samples. For example:
+
+    $ cmake -DCMAKE_INSTALL_PREFIX=~/junction-install -DJUNCTION_WITH_SAMPLES=OFF ..
+    $ cmake --build . --target install --config RelWithDebInfo
+
+Notes:
+
+* Instead of running the second `cmake` command, which runs the build system, you could run your build system directly. For example, `make install` on Unix, or build the INSTALL project in Visual Studio.
+* If using makefiles, you'll probably want to pass the additional option `-DCMAKE_BUILD_TYPE=RelWithDebInfo` to the first `cmake` command.
+
+This will create the following file structure:
+
+![Install folder](/docs/install-folder.png)
 
 ## Configuration
 
@@ -78,7 +88,7 @@ For example, to configure Turf to use the C++11 standard library, you can set th
 
 Or, using the CMake GUI:
 
-[[https://github.com/preshing/junction/docs/cmake-gui.png]]
+![CMake GUI](/docs/cmake-gui.png)
 
 Many header files in Turf, and some in Junction, are configurable using preprocessor definitions. For example, `turf/Thread.h` will switch between `turf::Thread` implementations depending on the values of `TURF_IMPL_THREAD_PATH` and `TURF_IMPL_THREAD_TYPE`. If those macros are not defined, they will be set to default values based on information from the environment. You can set them directly by providing your own header file and passing it in the `TURF_USERCONFIG` variable when CMake runs. You can place this file anywhere; CMake will copy it to Turf's build tree right next to `include/turf_config.h`.