Skip to content

Commit

Permalink
Update version to 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-Philippe Grimaldi committed May 9, 2016
0 parents commit 8a6c635
Show file tree
Hide file tree
Showing 1,344 changed files with 1,533,726 additions and 0 deletions.
60 changes: 60 additions & 0 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
^lib/libluxrays.a
^lib/libsmallluxgpu.a
^lib/libluxcore.a
^lib/pyluxcore.so
^lib/libglfw3.a
^doxygen-luxrays.conf
syntax: regexp
^doxygen/luxrays.template
^doxygen-slg.conf
^doxygen/slg.template
^doxygen-luxcore.conf
^doxygen/luxcore.template
^bin/*
^doc/*
^samples/(benchsimple|smallluxgpu)/(Debug|Release)/
samples/luxcoreui/deps/glfw-3.1.1/src/glfw_config.h
(smallluxgpu|slg|LUXRAYS|benchsimple)\.dir
^src/(Debug|Release)/
^(Debug|Release|x64)/
^nbproject/*
^scenes/strands/.*\.hair
^pyunittests/images/.*\.png
^pyunittests/referenceimages/.*\.png
^pyunittests/.*\.log
syntax: glob
*~
*CMakeFiles
*CMakeCache.txt
*Makefile
*cmake_install.cmake
moc_*.cxx
ui_*.h
qrc_*.cxx
*.sdf
*.vcxproj*
build
compile_commands.json

###########################
# XCode

*.pbxuser
*.perspective
*.perspectivev3
*.mode1v3
*.mode2v3
*.user

# XCode 4
xcuserdata/
*.xcworkspace
*.xccheckout

###########################
# OS OSX, junk
.DS_Store
*.swp
*~.nib
*.out
._*
11 changes: 11 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Authors:

David "Dade" Bucciarelli <dade916.at.gmail.com>
Jean-Philippe Grimaldi <jeanphi.at.via.ecp.fr>
Jean-Francois Romang <jeanfrancois.romang.at.laposte.net>
Asbjorn Heid <asbjorn.at.partialgeek.net>
Alain "Chiaroscuro" Ducharme <>
Jens Verwiebe <info.at.jensverwiebe.de>
Tom "Tomb" Bech <tom.bech.at.gmail.com>
Amir "foobarbarian" Mohammadkhani-Aminabadi <amir@mohammadkhani.eu>
Omni Flux <omniflux+devel.at.omniflux.com>
154 changes: 154 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
################################################################################
# Copyright 1998-2015 by authors (see AUTHORS.txt)
#
# This file is part of LuxRender.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################

MESSAGE(STATUS "CMAKE VERSION DETECTED " ${CMAKE_VERSION})


################################################################################
#
# Check and configure cmake
#
################################################################################
# Fresh start
cmake_minimum_required(VERSION 2.8)
cmake_policy(VERSION 2.8)
#Remove the following when the version check is at least 2.8.4
SET(CMAKE_LEGACY_CYGWIN_WIN32 0)

project(LuxRays)

# Don't over-configure
SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "limit configs" FORCE)


################################################################################
#
# Include necessary submodules
#
################################################################################

set(CMAKE_MODULE_PATH
"${LuxRays_SOURCE_DIR}"
"${LuxRays_SOURCE_DIR}/cmake"
"${LuxRays_SOURCE_DIR}/cmake/Utils"
"${LuxRays_SOURCE_DIR}/cmake/Packages"
"${LuxRays_SOURCE_DIR}/cmake/SpecializedConfig"
)

# When using single configuration generators like make
# cmake does need to know which of the possible configurations
# to generate
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "assure config" FORCE) # makes sure type is shown in cmake gui

message(STATUS "Building mode: " ${CMAKE_BUILD_TYPE})

INCLUDE(PlatformSpecific)
INCLUDE(Configuration)
INCLUDE(KernelPreprocess)

# Install CMake modules
#add_subdirectory(CMake)

SET(LuxRays_INCLUDE_DIR "${LuxRays_SOURCE_DIR}/include")
include_directories("${LuxRays_INCLUDE_DIR}")

# Find dependencies
include(Dependencies)

if (NOT Boost_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required Boost files - Please check ${BOOST_SEARCH_PATH}")
endif()

if (NOT OPENIMAGEIO_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required OpenImageIO files - Please check ${OPENIMAGEIO_SEARCH_PATH}")
endif()

if (NOT OPENCL_FOUND AND NOT LUXRAYS_DISABLE_OPENCL)
MESSAGE(ERROR "--> Could not locate required OpenCL files, disabling OpenCL support - Please check ${OPENCL_SEARCH_PATH}")
SET(LUXRAYS_DISABLE_OPENCL 1)
endif()

if (NOT OPENGL_FOUND AND NOT LUXRAYS_DISABLE_OPENCL)
MESSAGE(ERROR "--> Could not locate required OpenGL files, disabling OpenCL support, disabling samples build")
SET(LUXRAYS_DISABLE_OPENCL 1)
endif()

if (NOT GLEW_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}")
endif()

if (NOT GLUT_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}")
endif()

if (NOT EMBREE_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required Intel Embree files - Please check ${EMBREE_SEARCH_PATH}")
endif()

if (LUXRAYS_DISABLE_OPENCL)
ADD_DEFINITIONS("-DLUXRAYS_DISABLE_OPENCL")
endif()

if(NOT WIN32 AND NOT APPLE)
ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
endif()

################################################################################
#
# LuxRays, SLG and LuxCore libraries
#
################################################################################

add_subdirectory(src/luxrays)
add_subdirectory(src/slg)
add_subdirectory(src/luxcore)


################################################################################
#
# Samples
#
################################################################################

if(NOT APPLE OR OSX_BUILD_DEMOS)
add_subdirectory(samples/benchsimple)
add_subdirectory(samples/luxcoredemo)
add_subdirectory(samples/luxcorescenedemo)
add_subdirectory(samples/luxcoreimplserializationdemo)
endif()

if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
add_subdirectory(samples/smallluxgpu4)
endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)

add_subdirectory(samples/luxcoreconsole)
if(OPENGL_FOUND)
add_subdirectory(samples/luxcoreui)
endif(OPENGL_FOUND)


################################################################################
#
# For non win32 we'll have to copy everything to a single dir
#
################################################################################

INCLUDE(AssembleBinDirs)
Loading

0 comments on commit 8a6c635

Please sign in to comment.