mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
d563f26084
- Move DISTFILES setting back to master port exclusively as upstream had used correct (coherent with v1.4) tags for v1.6 this time - Register mutual port install-time conflict (CONFLICTS_INSTALL) - Create convenience symlink in `post-extract' rather than `pre-patch', because `200:dos2unix' bogusly(?) runs before `300:pre-patch' - Since luxrays' library samples are not built as of r410138, do not try to patch them (GC currently no-op patches) - For the same reason, do not request GLUT, GLEW, and execinfo libraries that were only used when building samples - Convert FreeImage to an option (mandatory for v1.4) and default to off
48 lines
1.6 KiB
Plaintext
48 lines
1.6 KiB
Plaintext
--- ../luxrays/CMakeLists.txt.orig
|
|
+++ ../luxrays/CMakeLists.txt
|
|
@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS
|
|
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()
|
|
@@ -124,29 +116,6 @@ 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
|
|
#
|
|
################################################################################
|