Update build scripts for MacOSX

.gitignore

@@ -1,8 +1,12 @@
+# Common ignore files
 build
 tmp
 output
 data/tmp
 .cccc
 spica_dirs.h
 
+# MacOSX ignore files
 .DS_Store
+.cproject
+.project

CMakeLists.txt

@@ -4,24 +4,33 @@ project(spica)
 # ------------------------------------------------------------------------------
 # Set compiler options
 # ------------------------------------------------------------------------------
+set(CMAKE_CXX_STANDARD 14)
 if (NOT WIN32)
   # Linux or Mac OS X
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -pthread")
   if (NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
   endif()
-  if (NOT MACOS AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp=libomp")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+endif()
+
+# ------------------------------------------------------------------------------
+# Find OpenMP
+# ------------------------------------------------------------------------------
+set(SPICA_USE_OPENMP OFF CACHE BOOL OFF)
+if (SPICA_USE_OPENMP)
+  find_package(OpenMP)
+  if (OPENMP_FOUND)
+    message(STATUS "OpenMP Supported!!")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
   endif()
 endif()
 
 # ------------------------------------------------------------------------------
 # Whether use static libraries or not
 # ------------------------------------------------------------------------------
-set(spica_USE_STATIC_LIBS OFF CACHE BOOL OFF)
+set(SPICA_USE_STATIC_LIBS OFF CACHE BOOL OFF)
 
 # ------------------------------------------------------------------------------
 # Set library prefices and suffices
@@ -30,15 +39,15 @@ if (WIN32)
   set(LIB_PREFIX "")
   set(LIB_SUFFIX ".lib")
 elseif(APPLE)
-  if (spica_USE_STATIC_LIBS)
+  if (SPICA_USE_STATIC_LIBS)
     set(LIB_PREFIX "lib")
     set(LIB_SUFFIX ".a")
   else()
     set(LIB_PREFIX "lib")
     set(LIB_SUFFIX ".dylib")
   endif()
 else()
-  if (spica_USE_STATIC_LIBS)
+  if (SPICA_USE_STATIC_LIBS)
     set(LIB_PREFIX "lib")
     set(LIB_SUFFIX ".a")
   else()
@@ -57,6 +66,13 @@ if (MSVC)
   add_definitions("/D_CRT_SECURE_NO_WARNINGS /W3 /wd4251")
 endif()
 
+# ------------------------------------------------------------------------------
+# Special settings for MacOSX
+# ------------------------------------------------------------------------------
+if (APPLE)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "10.11" FORCE)
+endif()
+
 # ------------------------------------------------------------------------------
 # Set output path
 # ------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-CC	         = clang
+CC           = clang
 CXX          = clang++
 GIT_BRANCH   = master
 PULL_REQUEST = false

sources/CMakeLists.txt

@@ -1,14 +1,6 @@
 set(SPICA_TARGET_NAME spica_renderer CACHE INTERNAL "")
 set(BUILD_TARGET ${SPICA_TARGET_NAME})
 
-if(MSVC)
-  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}")
-  endif()
-endif()
-
 set(ALL_SOURCES ${ALL_SOURCES})
 set(ALL_HEADERS ${ALL_HEADERS} ../include/spica.h)
 
@@ -44,7 +36,7 @@ process_subdirectory(accelerator)
 process_subdirectory(material)
 process_subdirectory(texture)
 
-if (spica_USE_STATIC_LIBS)
+if (SPICA_USE_STATIC_LIBS)
   add_library(${BUILD_TARGET} ${ALL_SOURCES} ${ALL_HEADERS})
 else()
   add_library(${BUILD_TARGET} SHARED ${ALL_SOURCES} ${ALL_HEADERS})