ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/CMakeLists.txt

Comparing ray/CMakeLists.txt (file contents):
Revision 1.25 by greg, Wed Jan 11 23:18:57 2023 UTC vs.
Revision 1.26 by greg, Wed Jan 11 23:31:17 2023 UTC

#	Line 34 | Line 34 | option(BUILD_LIBTIFF "Build libtiff?" OFF)
34		if(NOT WIN32)
35		set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
36		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
37	<	# set(qt_plugin_term "PLUGIN")
37	>	set(qt_plugin_term "PLUGIN")
38		endif()
39
40		if(WIN32)
#	Line 118 | Line 118 | endif()
118		include(CPack)
119
120		if(NOT BUILD_HEADLESS)
121	<	# find_package(Qt5Widgets)
122	<	# get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
123	<	# get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
124	<	# get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
121	>	find_package(Qt5Widgets)
122	>	get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
123	>	get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
124	>	get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
125		find_package(X11)
126		if(APPLE)
127		include_directories(${X11_INCLUDE_DIR})

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)