Revision: 73934
http://sourceforge.net/p/brlcad/code/73934
Author: vasco_costa
Date: 2019-09-16 14:20:23 +0000 (Mon, 16 Sep 2019)
Log Message:
-----------
Use trunk X11 detection routine so includes are detected on modern distros.
Modified Paths:
--------------
brlcad/branches/opencl/CMakeLists.txt
brlcad/branches/opencl/src/libdm/CMakeLists.txt
brlcad/branches/opencl/src/libtclcad/CMakeLists.txt
Modified: brlcad/branches/opencl/CMakeLists.txt
===================================================================
--- brlcad/branches/opencl/CMakeLists.txt 2019-09-16 13:39:22 UTC (rev
73933)
+++ brlcad/branches/opencl/CMakeLists.txt 2019-09-16 14:20:23 UTC (rev
73934)
@@ -1,7 +1,7 @@
# C M A K E L I S T S . T X T
# BRL-CAD
#
-# Copyright (c) 2010-2016 United States Government as represented by
+# Copyright (c) 2010-2019 United States Government as represented by
# the U.S. Army Research Laboratory.
#
# Redistribution and use in source and binary forms, with or without
@@ -1134,6 +1134,19 @@
set(BRLCAD_BUNDLED_LIBS "AUTO" CACHE STRING "Build bundled libraries." FORCE)
endif(NOT BRLCAD_BUNDLED_LIBS MATCHES "AUTO" AND NOT BRLCAD_BUNDLED_LIBS
MATCHES "BUNDLED" AND NOT BRLCAD_BUNDLED_LIBS MATCHES "SYSTEM")
+# Single flag for disabling GUI instead of 5.
+option(BRLCAD_ENABLE_MINIMAL "Skip GUI support and docs. Faster builds." OFF)
+mark_as_advanced(BRLCAD_ENABLE_MINIMAL)
+
+if(BRLCAD_ENABLE_MINIMAL)
+ set(BRLCAD_ENABLE_OPENGL "OFF")
+ set(BRLCAD_ENABLE_X11 "OFF")
+ set(BRLCAD_ENABLE_TK "OFF")
+ set(BRLCAD_ENABLE_QT "OFF")
+ set(BRLCAD_ENABLE_AQUA "OFF")
+ set(BRLCAD_EXTRADOCS "OFF")
+endif(BRLCAD_ENABLE_MINIMAL)
+
# Enable Aqua widgets on Mac OSX. This impacts Tcl/Tk building and OpenGL
# building. Not currently working - needs work in at least Tk
# CMake logic (probably more), and the display manager/framebuffer codes are
known to depend
@@ -1146,10 +1159,16 @@
# test for X11 on all platforms since we don't know when/where we'll find it,
unless
# we've indicated we *don't* want an X11 build
-if(NOT BRLCAD_ENABLE_AQUA)
+if(NOT BRLCAD_ENABLE_AQUA AND NOT BRLCAD_ENABLE_MINIMAL)
include(FindX11)
-endif(NOT BRLCAD_ENABLE_AQUA)
+endif(NOT BRLCAD_ENABLE_AQUA AND NOT BRLCAD_ENABLE_MINIMAL)
+# make sure Xi is included in the list of X11 libs
+# (Xext is automatically added during FindX11)
+if(X11_Xi_FOUND)
+ set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xi_LIB})
+endif(X11_Xi_FOUND)
+
# Set whether X11 is enabled or disabled by default
if(WIN32)
# even if there is x11, we default to native
@@ -1159,11 +1178,12 @@
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
else(WIN32)
# make everywhere else depend on whether we found a suitable X11
- if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
+ # X11_Xext_LIB AND X11_Xi_LIB AND
+ if(X11_FOUND AND NOT BRLCAD_ENABLE_MINIMAL)
option(BRLCAD_ENABLE_X11 "Use X11." ON)
- else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
+ else(X11_FOUND AND NOT BRLCAD_ENABLE_MINIMAL)
option(BRLCAD_ENABLE_X11 "Use X11." OFF)
- endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH)
+ endif(X11_FOUND AND NOT BRLCAD_ENABLE_MINIMAL)
endif(WIN32)
mark_as_advanced(BRLCAD_ENABLE_X11)
@@ -2269,24 +2289,28 @@
# Check for CoreFoundation and Cocoa on Apple
if(APPLE)
include(CMakeFindFrameworks)
- CMAKE_FIND_FRAMEWORKS(CoreFoundation)
- if(CoreFoundation_FRAMEWORKS)
- set(CoreFoundation_LIBRARIES "-framework CoreFoundation" CACHE FILEPATH
"CoreFoundation framework" FORCE)
- endif(CoreFoundation_FRAMEWORKS)
- CMAKE_FIND_FRAMEWORKS(Cocoa)
- if(Cocoa_FRAMEWORKS)
- set(Cocoa_LIBRARIES "-framework Cocoa" CACHE FILEPATH "Cocoa framework"
FORCE)
- endif(Cocoa_FRAMEWORKS)
+ CMAKE_FIND_FRAMEWORKS(Foundation)
+ if(Foundation_FRAMEWORKS)
+ set(Foundation_LIBRARIES "-framework Foundation" CACHE FILEPATH
"Foundation framework" FORCE)
+ CONFIG_H_APPEND(BRLCAD "#define HAVE_FOUNDATION_FOUNDATION_H 1\n")
+ endif(Foundation_FRAMEWORKS)
mark_as_advanced(CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
CMAKE_OSX_SYSROOT)
- mark_as_advanced(CoreFoundation_LIBRARIES Cocoa_LIBRARIES)
+ mark_as_advanced(Foundation_LIBRARIES)
endif(APPLE)
# Mark X11 as available if it is enabled and we find Xlib.h
if(BRLCAD_ENABLE_X11)
- if(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE)
+ message("X11 detected and enabled")
+ if(X11_Xlib_INCLUDE_PATH)
set(HAVE_X11_XLIB_H 1)
CONFIG_H_APPEND(BRLCAD "#cmakedefine HAVE_X11_XLIB_H 1\n")
- endif(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE)
+ message("Defining HAVE_X11_XLIB_H")
+ endif(X11_Xlib_INCLUDE_PATH)
+ if(X11_Xi_INCLUDE_PATH)
+ set(HAVE_X11_EXTENSIONS_XINPUT_H 1)
+ CONFIG_H_APPEND(BRLCAD "#cmakedefine HAVE_X11_EXTENSIONS_XINPUT_H 1\n")
+ message("Defining HAVE_X11_EXTENSIONS_XINPUT_H")
+ endif(X11_Xi_INCLUDE_PATH)
endif(BRLCAD_ENABLE_X11)
# math library
Modified: brlcad/branches/opencl/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/opencl/src/libdm/CMakeLists.txt 2019-09-16 13:39:22 UTC
(rev 73933)
+++ brlcad/branches/opencl/src/libdm/CMakeLists.txt 2019-09-16 14:20:23 UTC
(rev 73934)
@@ -34,7 +34,7 @@
endif(WIN32 AND BRLCAD_ENABLE_OPENGL)
if(BRLCAD_ENABLE_X11)
- set(DM_X_LIBS ${X11_LIBRARIES} ${X11_Xi_LIB})
+ set(DM_X_LIBS ${X11_LIBRARIES})
endif(BRLCAD_ENABLE_X11)
if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
@@ -136,6 +136,7 @@
add_dependencies(libdm profont_ProFont_ttf_cp)
endif(BRLCAD_ENABLE_OSG)
set(libdm_ignore_files
+ CMakeLists.txt
README
TODO
dm-Null.h
Modified: brlcad/branches/opencl/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/opencl/src/libtclcad/CMakeLists.txt 2019-09-16 13:39:22 UTC
(rev 73933)
+++ brlcad/branches/opencl/src/libtclcad/CMakeLists.txt 2019-09-16 14:20:23 UTC
(rev 73934)
@@ -20,7 +20,7 @@
BRLCAD_LIB_INCLUDE_DIRS(tclcad TCLCAD_INCLUDE_DIRS TCLCAD_LOCAL_INCLUDE_DIRS)
if(BRLCAD_ENABLE_X11)
- set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES} ${X11_Xi_LIB})
+ set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES})
endif(BRLCAD_ENABLE_X11)
set(LIBTCLCAD_SRCS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
