Merge pull request #325 from foodtiny/development

Release v1.0.5

Author: Food Tiny

.gitignore

@@ -2,27 +2,26 @@
 .DS_Store
 bin
 .idea
+.vscode
+.gradle
 CMakeFiles
-cmake-build-debug
-cmake_install.cmake
+cmake-*
+cmake_*
 CTestTestfile.cmake
 install_manifest.txt
 CMakeCache.txt
+CPack*
+_CPack*
 DartConfiguration.tcl
 Testing
 /src
 /Makefile
 /release/Makefile
 /native*
 libnative*
-/cygnative.dll
 /native_benchmark
 native_test.exe
 build
 libbenchmark.gcno
-.gradle
-gradle
-gradlew
-gradlew.bat
-/remove_old_build.sh
+gradle*
 /unit_test.sh

CMakeLists.txt

@@ -41,15 +41,20 @@ check_cxx_compiler_flag("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X)
 
 # Check CXX version
 if (COMPILER_SUPPORTS_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wfatal-errors")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wfatal-errors -Wno-multichar")
 elseif (COMPILER_SUPPORTS_CXX0X)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -Wfatal-errors")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -Wfatal-errors -Wno-multichar")
 else ()
     message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif ()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wfatal-errors")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+# Support for OpenMP
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+endif()
 
 # GNU Source compatible
 add_definitions(-D_GNU_SOURCE)
@@ -68,9 +73,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     endif ()
 endif ()
 
-# Dynamic linked library for OSX
-set(DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH})
-
 # Release mode
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -march=native")
 
@@ -142,6 +144,26 @@ install(FILES library.hpp DESTINATION ../include/native)
 install(DIRECTORY library DESTINATION ../include/native FILES_MATCHING PATTERN "*.hpp")
 install(DIRECTORY kernel DESTINATION ../include/native FILES_MATCHING PATTERN "*.hpp")
 
+# Detect operating system
+find_file (DEBIAN debian_version debconf.conf PATHS /etc)
+find_file (FEDORA fedora-release PATHS /etc)
+find_file (REDHAT redhat-release inittab.RH PATHS /etc)
+
+IF (${APPLE})
+    SET(CPACK_GENERATOR "DMG")
+endif()
+if (DEBIAN)
+    SET(CPACK_GENERATOR "DEB")
+endif()
+if (FEDORA OR REDHAT)
+    SET(CPACK_GENERATOR "RPM")
+endif()
+SET(CPACK_PACKAGE_CONTACT "loint.foodtiny@gmail.com")
+SET(CPACK_PACKAGE_DESCRIPTION "Native Library for C++")
+SET(CPACK_PACKAGE_VERSION  "1.0.4")
+SET(CPACK_PACKAGE_MAINTAINER "Loi Nguyen")
+INCLUDE(CPack)
+
 # Add uninstall
 add_custom_target(
         uninstall
@@ -152,6 +174,7 @@ add_custom_target(
 # Link library for OSX and other platform
 # Darwin platform no need to link realtime library (-lrt)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH})
     target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} -lm)
     target_link_libraries(${PROJECT_NAME}_test ${CMAKE_THREAD_LIBS_INIT} -lm)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

install

@@ -31,7 +31,7 @@ namespace Java {
 		namespace Lang {
 				class Runnable {
 				public:
-						virtual void run() const = 0;
+						virtual void run() = 0;
 				};
 		}
 }