Merge pull request #4 from moja-global/develop

Develop
moja-global · May 24, 2019 · 22db564 · 22db564
2 parents ee4a088 + 6e5dddb
commit 22db564
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.4.0)
 
 set(MOJA_VERSION_MAJOR "1")
 set(MOJA_VERSION_MINOR "0")
-set(MOJA_VERSION_PATCH "5")
-set(MOJA_VERSION_REVISION "1")
+set(MOJA_VERSION_PATCH "0")
+set(MOJA_VERSION_REVISION "0")
 set(MOJA_VERSION "${MOJA_VERSION_MAJOR}.${MOJA_VERSION_MINOR}.${MOJA_VERSION_PATCH}")
 
 # Collect the built libraries and include dirs, the will be used to create the moja.cmake file

diff --git a/Source/moja.datarepository/tests/src/providerspatialrastertiledtests.cpp b/Source/moja.datarepository/tests/src/providerspatialrastertiledtests.cpp
@@ -3,6 +3,9 @@
 #include "moja/datarepository/providerspatialrastertiled.h"
 #include "moja/datarepository/datarepositoryexceptions.h"
 
+#include <iostream>
+#include <iostream>
+
 #include "moja/types.h"
 #include "moja/dynamic.h"
 

diff --git a/Source/moja.datarepository/tests/src/tileblockcellindexertests.cpp b/Source/moja.datarepository/tests/src/tileblockcellindexertests.cpp
@@ -4,6 +4,9 @@
 
 #include "moja/dynamic.h"
 
+#include <iostream>
+#include <iostream>
+
 #include <boost/test/unit_test.hpp>
 
 #include <vector>

diff --git a/Source/moja.flint.configuration/CMakeLists.txt b/Source/moja.flint.configuration/CMakeLists.txt
@@ -2,6 +2,8 @@ set(PACKAGE "configuration")
 set(LIBNAME "moja.flint.${PACKAGE}")
 string(TOUPPER "${PACKAGE}" LIBNAME_EXPORT)
 
+include(${CMAKE_MODULE_PATH}/generate_product_version.cmake) 
+
 if(MOJA_STATIC)
 	set(CMAKE_CXX_FLAGS_RELEASE "/MT")
 	set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
@@ -25,6 +27,20 @@ endif()
 
 include_directories(include ../moja.core/include)
 
+# Version Info
+if (MSVC)
+  generate_product_version(ProductVersionFiles
+    NAME ${LIBNAME}
+    FILE_DESCRIPTION "moja global configuration"
+    VERSION_MAJOR ${MOJA_VERSION_MAJOR}
+    VERSION_MINOR ${MOJA_VERSION_MINOR}
+    VERSION_PATCH ${MOJA_VERSION_PATCH}
+    VERSION_REVISION ${MOJA_VERSION_REVISION}
+	COMPANY_NAME "moja global"
+#    VERSION_REVISION ${BUILD_ID}
+  )
+endif ()
+
 if(Poco_FOUND)
 	link_directories(${Poco_BINARY_DIRS})
 endif()
@@ -100,7 +116,9 @@ set(MOJA_FLINT_Configuration_sources
 )
 
 set (SRCS ${MOJA_FLINT_Configuration_sources} ${MOJA_FLINT_Configuration_headers})
-add_library(${LIBNAME} ${LIB_MODE} ${SRCS})
+add_definitions( -DPOCO_NO_AUTOMATIC_LIBS )
+add_library(${LIBNAME} ${LIB_MODE} ${SRCS} ${ProductVersionFiles})
+
 set_target_properties(${LIBNAME} 
 	PROPERTIES
 	VERSION ${MOJA_VERSION} SOVERSION ${MOJA_VERSION_MAJOR}

diff --git a/Source/moja.modules.zipper/tests/src/providerspatialrastertiledtests.cpp b/Source/moja.modules.zipper/tests/src/providerspatialrastertiledtests.cpp
@@ -6,6 +6,9 @@
 #include "moja/types.h"
 #include "moja/dynamic.h"
 
+#include <iostream>
+#include <iostream>
+
 #include <Poco/TemporaryFile.h>
 #include <Poco/FileStream.h>
 #include <Poco/File.h>