Merge branch 'dev' into contributor-lr

.travis.yml

@@ -16,7 +16,7 @@ before_install:
 before_script:
   - mkdir -p $BUILD_HOME
   - cd $BUILD_HOME
-  - cmake ..
+  - cmake -DBUILD_TESTS=1 .. 
 
 script:
   - cmake --build . 

CMakeLists.txt

@@ -10,7 +10,6 @@
 # properly installed. Build using Visual Studio requires msbuild shell.
 #
 # Example Usage:
-#   cd build/cmake
 #   mkdir buildproducts
 #   cd buildproducts
 #   cmake ..
@@ -29,7 +28,7 @@
 # Generic Invocation:
 #   cmake -E make_directory buildprod
 #   cd build
-#   cmake -G GENERATOR -DCMAKE_BUILD_TYPE=Release ..
+#   cmake -G GENERATOR -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=1 ..
 #   cmake --build . --target SOME_TARGET --config Release
 #
 # More information:
@@ -42,8 +41,10 @@ cmake_minimum_required (VERSION 2.8.8)
 
 project(EPANET)
 add_subdirectory(tools/epanet-output)
-add_subdirectory(tests)
 
+IF (BUILD_TESTS)
+  add_subdirectory(tests)
+ENDIF (BUILD_TESTS)
 
 # Sets for output directory for executables and libraries.
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -55,8 +56,8 @@ SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 
 IF (APPLE)
-  SET(CMAKE_INSTALL_NAME_DIR @executable_path)
+SET(INSTALL_NAME_DIR @executable_path/../lib)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+SET(CMAKE_MACOSX_RPATH 1)
 ENDIF (APPLE)
 
 IF (MSVC)

README.md

@@ -5,9 +5,11 @@ EPANET {#epanet-readme}
 [![Build status](https://ci.appveyor.com/api/projects/status/19wpg4g2cmj3oihl?svg=true)](https://ci.appveyor.com/project/OpenWaterAnalytics/epanet)
 [![Build Status](https://travis-ci.org/OpenWaterAnalytics/EPANET.svg?branch=master)](https://travis-ci.org/OpenWaterAnalytics/EPANET)
 
-The EPANET Library is a pressurized pipe network hydraulic and water quality analysis toolkit written in C. 
+## For EPANET-related questions and discussion
+For community discussion, FAQ, and roadmapping of the project, go to the [Community Forum](http://community.wateranalytics.org/category/epanet). 
 
-If you are interested in using/extending EPANET for academic, personal, or commercial use, then you've come to the right place. For community discussion, FAQ, and roadmapping of the project, go to the [Community Forum](http://community.wateranalytics.org/category/epanet). 
+## What is on this Repository?
+The EPANET Library is a pressurized pipe network hydraulic and water quality analysis toolkit written in C. If you are interested in using/extending EPANET for academic, personal, or commercial use, then you've come to the right place. 
 
 Please see the [`version 2.1` Release Notes](https://github.com/OpenWaterAnalytics/EPANET/blob/master/ReleaseNotes2_1.md) for information relevant to users of the previous official version (2.00.12). If you would like to contribute by addressing any of the outstanding [Issues](https://github.com/OpenWaterAnalytics/EPANET/issues), then please comment on the Issue, then Fork this repo to your own account and base your commits on the [`dev` branch](https://github.com/OpenWaterAnalytics/EPANET/tree/dev). Once you are finished, you can open a Pull Request to test the code and discuss merging your changes back into the community respository.
 

appveyor.yml

@@ -47,7 +47,8 @@ install:
 before_build:
   - mkdir %BUILD_HOME%
   - cd %BUILD_HOME%
-  - cmake -G "%GENERATOR%" 
+  - cmake -G %GENERATOR% 
+    -DBUILD_TESTS=1
     -DBOOST_ROOT="%BOOST_ROOT%"
     -DBoost_USE_STATIC_LIBS="ON" ..