summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMake/options.cmake8
-rw-r--r--configh.cmake.in6
-rw-r--r--src/CMakeLists.txt2
3 files changed, 15 insertions, 1 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 0ae0195b8..94ff1e69e 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -79,6 +79,7 @@ option(OPTION_BUILD_SHARED_LIBS
#######################################################################
option(OPTION_BUILD_EXAMPLES "build example programs" ON)
option(OPTION_PRINT_SUPPORT "allow print support" ON)
+option(OPTION_FILESYSTEM_SUPPORT "allow file system support" ON)
#######################################################################
if(DOXYGEN_FOUND)
@@ -363,6 +364,13 @@ endif(X11_FOUND AND NOT OPTION_PRINT_SUPPORT)
#######################################################################
#######################################################################
+set(FL_CFG_FILESYSTEM_SUPPORT FALSE)
+if(OPTION_FILESYSTEM_SUPPORT)
+ set(FL_CFG_FILESYSTEM_SUPPORT TRUE)
+endif(OPTION_FILESYSTEM_SUPPORT)
+#######################################################################
+
+#######################################################################
# prior to CMake 3.0 this feature was buggy
if(NOT CMAKE_VERSION VERSION_LESS 3.0.0)
option(CMAKE_SUPPRESS_REGENERATION
diff --git a/configh.cmake.in b/configh.cmake.in
index 5c5902898..d3644ebaa 100644
--- a/configh.cmake.in
+++ b/configh.cmake.in
@@ -343,5 +343,11 @@
#cmakedefine NO_PRINT_SUPPORT 1
/*
+ * Do we want filename handling and a filechooser?
+ */
+
+#cmakedefine FL_CFG_FILESYSTEM_SUPPORT 1
+
+/*
* End of "$Id$".
*/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e32ba327d..ce66cbcb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -395,7 +395,7 @@ endif(OPTION_USE_SYSTEM_LIBPNG)
#######################################################################
if(OPENGL_FOUND)
-FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}";${GL_HEADER_FILE};${GL_DRIVER_HEADER_FILES})
+FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES};${GL_HEADER_FILE};${GL_DRIVER_HEADER_FILES}")
target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
endif(OPENGL_FOUND)