Merge remote-tracking branch 'remotes/origin/master' into release

Conflicts:
	include/version.h
	src/pack_functions.cmake
	src/pack_header.cmake

Author: febret

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "omicron"]
-	path = omicron
+[submodule "src/omicron"]
+	path = src/omicron
 	url = https://github.com/febret/omicron.git

Authors.txt

@@ -15,6 +15,7 @@ Lead Developer:
 
 Contributors:
     Dennis Chau
+    Thomas Marrinan
     Victor Mateviitsi
     Koosha Mirhosseini
     Brad McGinnis
@@ -29,7 +30,6 @@ Module Contributors:
     Owen Kaluza
     Andreas Limbera
     Jason Leigh
-    Thomas Marrinan
     Matt McCrory
     Alex Simes
 

CMakeLists.txt

@@ -31,42 +31,12 @@ if(CMAKE_GENERATOR STREQUAL "Xcode")
 endif(CMAKE_GENERATOR STREQUAL "Xcode")
 #-------------------------------------------------------------------------------
 # Create a build name depending on the OS, Toolset and architecture.
-if(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_32 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS9 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008 Win64")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_64 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS9 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 10" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10 2010")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_32 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS10 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 10 Win64" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10 2010 Win64")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_64 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS10 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 11" OR CMAKE_GENERATOR STREQUAL "Visual Studio 11 2012")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_32 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS11 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 11 Win64" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10 2012 Win64")
-    set(OMEGA_OS_WIN 1)
-    set(OMEGA_ARCH_64 1)
-    set(OMEGA_ARCH_WIN32 1)
-    set(OMEGA_TOOL_VS11 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 12" OR CMAKE_GENERATOR STREQUAL "Visual Studio 12 2013")
+if(CMAKE_GENERATOR STREQUAL "Visual Studio 12 2013")
     set(OMEGA_OS_WIN 1)
     set(OMEGA_ARCH_32 1)
     set(OMEGA_ARCH_WIN32 1)
     set(OMEGA_TOOL_VS12 1)
-elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 12 Win64" OR CMAKE_GENERATOR STREQUAL "Visual Studio 12 2013 Win64")
+elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 12 2013 Win64")
     set(OMEGA_OS_WIN 1)
     set(OMEGA_ARCH_64 1)
     set(OMEGA_ARCH_WIN32 1)
@@ -111,7 +81,7 @@ elseif(CMAKE_GENERATOR STREQUAL "Xcode")
     set(OMEGA_ARCH_32 1)
     set(OMEGA_ARCH_I386 1)
     set(OMEGA_TOOL_GCC 1)
-endif(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+endif()
 
 # The default home directory is the omegalib source directoy. At runtime this
 # will be replaced by the OMEGA_HOME environment variable when available.

CMakeModules/ModuleUtils.cmake

@@ -38,6 +38,7 @@ function(module_def MODULE_NAME URL DESCRIPTION)
 		# substitute dashes with underscores in macro module names ('-' is
 		# not a valid character
 		string(REPLACE "-" "_" MACRO_MODULE_NAME ${MODULE_NAME})
+		string(REPLACE "." "_" MACRO_MODULE_NAME ${MACRO_MODULE_NAME})
 		file(APPEND ${MODULES_CONFIG_FILE} "#define ${MACRO_MODULE_NAME}_ENABLED\n")
 
 		# find dependencies