Merge pull request #1 from rigtorp/dev

Update to modern cmake layout

Author: rigtorp

.travis.yml

@@ -2,31 +2,101 @@ language: cpp
 
 sudo: false
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.7      
-      - george-edison55-precise-backports
-    packages:
-      - gcc-5
-      - g++-5
-      - clang-3.7
-      - cmake
-      - cmake-data
-      - libsparsehash-dev
-
 matrix:
   include:
-    - os: linux
-      compiler: gcc
-      env: CCC=gcc-5 CCXX=g++-5
-    - os: linux
+
+    # clang-4
+    - env: COMPILER=clang++-4.0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+            - libstdc++-6-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+
+    # clang-5
+    - env: COMPILER=clang++-5.0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-5.0
+            - libstdc++-7-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+
+    # clang-6
+    - env: COMPILER=clang++-6.0
       compiler: clang
-      env: CCC=clang-3.7 CCXX=clang++-3.7
-        
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+            - libstdc++-7-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
+
+    # gcc-5
+    - env: COMPILER=g++-5
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-5
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    # gcc-6
+    - env: COMPILER=g++-6
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    # gcc-7
+    - env: COMPILER=g++-7
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-7
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    # gcc-8
+    - env: COMPILER=g++-8
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
 before_script:
-  - export CC=$CCC CXX=$CCXX
+  - export CXX=$COMPILER
   - mkdir build
   - cd build
   - cmake --version

CMakeLists.txt

@@ -1,12 +1,24 @@
 cmake_minimum_required(VERSION 3.2)    
-project(HashMap)
+project(HashMap CXX)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "true")
-set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -pedantic -g")
+set(CMAKE_CXX_STANDARD 14)
 
-add_executable(HashMapBenchmark HashMapBenchmark.cpp)
-add_executable(HashMapExample HashMapExample.cpp)
-add_executable(HashMapTest HashMapTest.cpp)
+add_compile_options(-Wall -Wextra -Wpedantic -Werror)
+
+add_library(HashMap INTERFACE)
+target_include_directories(HashMap INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>)
+
+add_executable(HashMapBenchmark src/HashMapBenchmark.cpp)
+target_link_libraries(HashMapBenchmark HashMap)
+
+add_executable(HashMapExample src/HashMapExample.cpp)
+target_link_libraries(HashMapExample HashMap)
+
+add_executable(HashMapTest src/HashMapTest.cpp)
+target_link_libraries(HashMapTest HashMap)
 
 enable_testing()
 add_test(HashMapTest HashMapTest)

HashMap.h renamed to include/rigtorp/HashMap.h

@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-#include "HashMap.h"
 #include <chrono>
 #include <google/dense_hash_map>
 #include <iostream>
 #include <random>
+#include <rigtorp/HashMap.h>
 #include <unordered_map>
 
 using namespace rigtorp;
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
   constexpr size_t count = 1000;
   constexpr size_t iters = 100000000;
 
-  auto b = [count, iters](const char *n, auto &m) {
+  auto b = [](const char *n, auto &m) {
     std::mt19937 mt;
     std::uniform_int_distribution<int> ud(2, count);
 

HashMapBenchmark.cpp renamed to src/HashMapBenchmark.cpp

@@ -1,5 +1,5 @@
-#include "HashMap.h"
 #include <iostream>
+#include <rigtorp/HashMap.h>
 
 int main(int argc, char *argv[]) {
   (void)argc, (void)argv;

HashMapExample.cpp renamed to src/HashMapExample.cpp

@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
-#include "HashMap.h"
 #include <algorithm>
 #include <array>
+#include <rigtorp/HashMap.h>
 
 using namespace rigtorp;