Add the version number to vectorwrapper.hpp

CMakeLists.txt

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
+cmake_policy(SET CMP0048 NEW)
+project(vectorwrapper VERSION 1.1.0)
+
+if (BUILD_TESTS)
+	add_subdirectory(test)
+endif()
+
+configure_file(
+	include/vectorwrapper/vectorwrapper.hpp.in
+	${CMAKE_CURRENT_BINARY_DIR}/include/vectorwrapper/vectorwrapper.hpp
+	@ONLY
+)
+
+install(DIRECTORY include/vectorwrapper
+	DESTINATION include
+	PATTERN vectorwrapper.hpp.in EXCLUDE
+)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/vectorwrapper
+	DESTINATION include
+)

include/vectorwrapper/sequence_range.hpp

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "vectorwrapper.hpp"
+#include "vectorwrapper/vectorwrapper.hpp"
-#include "sequence_bt.hpp"
+#include "vectorwrapper/sequence_bt.hpp"
-#include "size_type.hpp"
+#include "vectorwrapper/size_type.hpp"
 #include <iterator>
 #include <ciso646>
 #include <cassert>

include/vectorwrapper/vector_cast.hpp

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "sequence_bt.hpp"
+#include "vectorwrapper/sequence_bt.hpp"
-#include "size_type.hpp"
+#include "vectorwrapper/size_type.hpp"
-#include "vectorwrapper.hpp"
+#include "vectorwrapper/vectorwrapper.hpp"
 
 #if defined VWR_OUTER_NAMESPACE
 namespace VWR_OUTER_NAMESPACE {

include/vectorwrapper/vectorops.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "vectorwrapper.hpp"
+#include "vectorwrapper/vectorwrapper.hpp"
-#include "size_type.hpp"
+#include "vectorwrapper/size_type.hpp"
 #include <type_traits>
 #include <cstddef>
 

include/vectorwrapper/vectorwrapper.hpp.in

@@ -16,16 +16,20 @@
 
 #pragma once
 
-#include "sequence_bt.hpp"
+#include "vectorwrapper/sequence_bt.hpp"
-#include "size_type.hpp"
+#include "vectorwrapper/size_type.hpp"
-#include "implem_vec_base.hpp"
+#include "vectorwrapper/implem_vec_base.hpp"
-#include "implem_vec_common.hpp"
+#include "vectorwrapper/implem_vec_common.hpp"
 #include <ciso646>
 #include <type_traits>
 #include <array>
 #include <cassert>
 #include <functional>
 
+#define VWR_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define VWR_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define VWR_VERSION_PATCH @PROJECT_VERSION_PATCH@
+
 #if defined VWR_OUTER_NAMESPACE
 namespace VWR_OUTER_NAMESPACE {
 #endif
@@ -398,4 +402,4 @@ namespace vwr {
 } //namespace VWR_OUTER_NAMESPACE
 #endif
 
-#include "vectorwrapper.inl"
+#include "vectorwrapper/vectorwrapper.inl"

test/CMakeLists.txt

@@ -1,13 +1,14 @@
 cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
+cmake_policy(SET CMP0048 NEW)
 
 include(CTest)
 
 add_subdirectory(gtest-1.7.0)
-set(GTEST_MAIN_CPP "${CMAKE_SOURCE_DIR}/gtest-1.7.0/src/gtest_main.cc")
+set(GTEST_MAIN_CPP "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.7.0/src/gtest_main.cc")
-set(UNITTEST_DATA_DIR "${CMAKE_SOURCE_DIR}/../data")
+set(UNITTEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../data")
 
 include_directories(SYSTEM
-	gtest-1.7.0/include
+	${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.7.0/include
 )
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -std=c++11")
@@ -20,6 +21,9 @@ add_definitions(
 	-Wconversion
 )
 
-include_directories(../include)
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/../include
+	${CMAKE_CURRENT_BINARY_DIR}/../include
+)
 add_subdirectory(unit)
 add_subdirectory(unit_noconv)