Merge pull request #9 from uic-evl/master

merge lastest version
caishanli · Jun 20, 2016 · 98d14aa · 98d14aa
2 parents d21370a + 42db817
commit 98d14aa
Show file tree

Hide file tree

Showing 340 changed files with 4,946 additions and 57,764 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "omicron"]
-	path = omicron
+[submodule "src/omicron"]
+	path = src/omicron
 	url = https://github.com/febret/omicron.git
diff --git a/Authors.txt b/Authors.txt
@@ -15,6 +15,8 @@ Lead Developer:
 
 Contributors:
     Dennis Chau
+    Derek Gerstmann
+    Thomas Marrinan
     Victor Mateviitsi
     Koosha Mirhosseini
     Brad McGinnis
@@ -23,15 +25,16 @@ Contributors:
     Qi Sun
 
 Module Contributors:
+    Caroline Grace Alexander
     David Barnes
     Daniele Donghi
     Andrew Johnson
     Owen Kaluza
     Andreas Limbera
     Jason Leigh
-    Thomas Marrinan
     Matt McCrory
     Alex Simes
+    Luolei Zhao
 
 Patch Contributors:
     J Markus Maunus

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,69 +4,26 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
 project(OmegaLib)
 
+# The default home directory is the omegalib source directoy. At runtime this
+# will be replaced by the OMEGA_HOME environment variable when available.
+set(OMEGA_HOME "${OmegaLib_SOURCE_DIR}")
+
 set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install)
 
 include(CPack)
 
 if(COMMAND cmake_policy)
       cmake_policy(SET CMP0003 NEW)
-      #cmake_policy(SET CMP0008 NEW)
-endif(COMMAND cmake_policy)
-
-message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
 
-# Fin the current branch
-execute_process(
-  COMMAND git rev-parse --abbrev-ref HEAD
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_BRANCH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-if(CMAKE_GENERATOR STREQUAL "Xcode")        
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libstdc++" CACHE STRING "" FORCE)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
-    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
-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)
@@ -82,7 +39,7 @@ elseif(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
         set(OMEGA_ARCH_64 1)
         set(OMEGA_TOOL_GCC 1)
         set(CMAKE_CXX_FLAGS "-Wno-ignored-qualifiers -Wno-enum-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-switch -Wno-c++11-compat-deprecated-writable-strings -Wno-return-type-c-linkage -Wno-unused-value -Wno-dynamic-class-memaccess -Wno-parentheses-equality -stdlib=libstdc++" CACHE STRING "compile flags" FORCE)
-    else(APPLE)
+    else()
         if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
             set(OMEGA_OS_LINUX 1)
             set(OMEGA_ARCH_64 1)
@@ -106,22 +63,17 @@ elseif(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
         #set(CMAKE_POSITION_INDEPENDENT_CODE On)
 	endif()
 elseif(CMAKE_GENERATOR STREQUAL "Xcode")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
     set(OMEGA_OS_OSX 1)
     set(OMEGA_ARCH_32 1)
     set(OMEGA_ARCH_I386 1)
     set(OMEGA_TOOL_GCC 1)
-endif(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-
-# The default home directory is the omegalib source directoy. At runtime this
-# will be replaced by the OMEGA_HOME environment variable when available.
-set(OMEGA_HOME "${OmegaLib_SOURCE_DIR}")
-
-if(OMEGA_OS_WIN)
-    add_definitions(-D_WIN32_WINNT=0x0600)
-    add_definitions(-DWINNT=0x600)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32")
-endif(OMEGA_OS_WIN)
+endif()
 
 #-------------------------------------------------------------------------------
 # Set the output directories for libraries and binary files
@@ -148,39 +100,8 @@ else(MSVC OR CMAKE_GENERATOR STREQUAL "Xcode")
     file(MAKE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 endif(MSVC OR CMAKE_GENERATOR STREQUAL "Xcode")
 
-#-------------------------------------------------------------------------------
-# Visual studio specific options.
-# if(MSVC)
-# # Exclude libcmt when linking in visual studio
-# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib")# set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib")
-# add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4244 /wd4018)
-# endif(MSVC)
-
-#-------------------------------------------------------------------------------
-# Identify omegalib core version
-file(STRINGS ${CMAKE_SOURCE_DIR}/include/version.h
-    OMEGALIB_VERSION_MAJOR
-    REGEX "^#define OMEGA_VERSION_MAJOR.*")
-
-file(STRINGS ${CMAKE_SOURCE_DIR}/include/version.h
-    OMEGALIB_VERSION_MINOR
-    REGEX "^#define OMEGA_VERSION_MINOR.*")
-
-file(STRINGS ${CMAKE_SOURCE_DIR}/include/version.h
-    OMEGALIB_VERSION_REVISION
-    REGEX "^#define OMEGA_VERSION_REVISION.*")
-
-string(REGEX MATCH "[0-9]+" OMEGALIB_VERSION_MAJOR ${OMEGALIB_VERSION_MAJOR})
-string(REGEX MATCH "[0-9]+" OMEGALIB_VERSION_MINOR ${OMEGALIB_VERSION_MINOR})
-string(REGEX MATCH "[0-9]+" OMEGALIB_VERSION_REVISION ${OMEGALIB_VERSION_REVISION})
-
-if(${OMEGALIB_VERSION_REVISION} GREATER 0)
-    set(OMEGALIB_VERSION ${OMEGALIB_VERSION_MAJOR}.${OMEGALIB_VERSION_MINOR}.${OMEGALIB_VERSION_REVISION})
-else()
-    set(OMEGALIB_VERSION ${OMEGALIB_VERSION_MAJOR}.${OMEGALIB_VERSION_MINOR})
-endif()
-
-message("Omegalib version identified: ${OMEGALIB_VERSION} - ${GIT_BRANCH}")
+include(OmegalibVersion)
+
 # Add subdirectiories
 add_subdirectory(src)