summaryrefslogtreecommitdiff
path: root/CMake
AgeCommit message (Collapse)Author
2020-06-27Add classes Fl_SVG_File_Surface and Fl_EPS_File_Surface to draw to SVG and EPS.ManoloFLTK
Test programs device and pixmap_browser use these new classes. Class Fl_SVG_File_Surface can be optionally made non functional using the --disable-svg configure option or turning off OPTION_USE_SVG in CMake. Class Fl_EPS_File_Surface can be optionally made non functional using the --disable-print configure option or turning off OPTION_PRINT_SUPPORT in CMake.
2020-06-21Quick fix for inability to link with pango from fltk-configTaeril
Commit 6fe226cb804d000b29ea53e08acc505267fd44de introduced use of pkg-config which broke linking from fltk-config if FLTK was configured to use pango library. This patch duplicates line from another if branch that just adds libraries assuming that if pkg-config found pangoxft that there are present all it's requirements.
2020-06-13CMake: Build static and shared libs side-by-sideAlbrecht Schlosser
Clean up library and variable names. Remove '_SHARED' suffix from library (output) filenames. This commit was inspired by David Runge ('dvzrv'), thanks. See PR #21. Fixes #21
2020-06-13CMake: Deprecate FLTK_USE_FILE (UseFLTK.cmake)Albrecht Schlosser
Cherry-pick the essential changes from FLTK 1.3 since this change had not been ported to 1.4 yet. To do: my current plan is to consolidate 1.3 and 1.4 CMake files as far as possible (with the exceptions of source files, obviously) and to redesign / refactor CMake files later in this process or maybe only for 1.4 if it turns out to be too much to backport.
2020-04-22Unexpand $Id$ marker in the last remaining fileAlbrecht Schlosser
2020-04-15CMake: use pkg_check_modules to search for pangoxftManoloFLTK
Command pkg_check_modules is present in CMake 2.6
2020-02-14CMake: set option to build docs (default): ONAlbrecht Schlosser
This option does not build the documentation automatically, docs still must be built manually, e.g. 'make docs' or 'make html'.
2020-01-18Set OPTION_USE_SYSTEM_LIBPNG/JPEG off under macOS by defaultManoloFLTK
2020-01-18Remove temporary CMake option OPTION_HIDPI no longer used.ManoloFLTK
2019-10-31Continue CMake support of the Darwin+XQuartz+fink test platformManoloFLTK
2019-10-30Restore CMake support of Darwin + XQuartz + fink test platformManoloFLTK
2019-10-30Restore CMake support of Darwin + XQuartz + finkManoloFLTK
2019-06-04Fix typo in CMake macro FL_ADD_LIBRARYAlbrecht Schlosser
2019-05-12Correct config installation path on macOSLasse Lopperi
Before: install/FLTK/.framework/Resources/CMake/FLTKConfig.cmake After: install/FLTK.framework/Resources/CMake/FLTKConfig.cmake See https://cmake.org/cmake/help/v3.0/command/find_package.html for definitions of expected installation paths.
2019-01-17Android CMake: icons, docs, more appsMatthias Melcher
2019-01-17Andoird CMake: trying to autocreate Fluid filesMatthias Melcher
2019-01-16Android CMake: fix, more autogenerated filesMatthias Melcher
Fixed a bug that would cause an error is Android Build was NOT defined. Creating list of test targets automatically.
2019-01-16Android CMake: macro for multiple testsMatthias Melcher
Added a macro that creates the IDE files for a named test. This is just a rough layout and will only work for the simpelest of test targets.
2019-01-15Android: starting to use CMake to build AndroidStudio files.Matthias Melcher
2019-01-14Android: modifying CMake to also create AndroidStudio IDEMatthias Melcher
2019-01-14Android: modifying CMake to also create AndroidStudio IDEMatthias Melcher
2018-12-29Add a CMake option to generate driver (developer) documentation.Albrecht Schlosser
Generating driver documentation can now be configured with CMake. The new configuration OPTION_INCLUDE_DRIVER_DOCUMENTATION is "marked as advanced" since only advanced users and/or FLTK developers need this. Previously this could only be achieved by editing documentation/Doxyfile.in. Added missing documentation option descriptions as well.
2018-12-22Removes few tabs from options.cmake. When removing tabs, also apply cmp ↵fabien
standard (two spaces) recommended indentation.
2018-12-22remove unnecessary double braces in option.cmake cairo detection codefabien
2018-12-22CMake CAIRO support minor improvements: Make the conditional code more ↵fabien
readeable by reusing the already parsed PKG_CAIRO_FOUND variable instead of testing for it again, which also simplifies the preconditions testing. Fix typo (. in endif statement comment).
2018-12-20Improve CMake's Cairo detection and issue error message...Albrecht Schlosser
... if Cairo was requested (OPTION_CAIRO or OPTION_CAIROEXT) but Cairo was not found. CMake generation is terminated with a fatal error. The user has two choices: install Cairo libs and headers or disable OPTION_CAIRO and OPTION_CAIROEXT.
2018-12-16macOS + CMake + OPTION_APPLE_X11 : restore building of GLU-based test apps.ManoloFLTK
2018-06-23Removed macro FL_PORTING, as it has been more confusing than helpful.Matthias Melcher
The original intention of FL_PORTING was to mark all places in the source code where changes are required to port FLTK to a new platform. Thanks to the driver system, this approach has become somewhat misleading, so I removed all references. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12969 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-06-19Add missing winsock dll to variables.cmake (fixes fltk-config).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12948 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-16CMake/fltk-config: update fltk-config (LDFLAGS) for MacOS.Albrecht Schlosser
This is a preliminary patch to enable linking with pango on MacOS when fltk-config is used. A better solution is under development. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-25CMake + configure: improve generation of fltk-config.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12692 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-24CMake: fix fltk-config generation for MacOS.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12687 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-23CMake: Fix fltk-config for Windows and Unix/Linux.Albrecht Schlosser
This update ought to work with fltk-config [--use-images] [--use-gl] --compile <c source file> on both Windows and Unix/Linux when built with CMake. It was tested under Windows and Linux using fltk-config directly from the build tree, but it should work as well after installation. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12686 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-18CMake: fix generated fltk-config for Windows (partially).Albrecht Schlosser
This makes 'fltk-config --compile' work with simple test applications like hello.cxx etc. It may not yet work with other options though, particularly with --use-gl or --use-images, but it's an improvement. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12676 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-18CMake: fix debug macro for CMake versions before 3.4.Albrecht Schlosser
Note: string(APPEND ...) was introduced in CMake 3.4. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12675 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-09CMake: add macro fl_debug_var to debug variables.Albrecht Schlosser
Some debug messages are included, but currently disabled. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12658 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-02-09Replace "WIN32" with "_WIN32" or "Windows".Albrecht Schlosser
Replace compiler/preprocessor/platform macro "WIN32" with "_WIN32". Replace "WIN32" in text and documentation with "Windows". Replace "MSWindows" with "Windows". To do: README.Windows.txt (and maybe other documentation as well) needs updates. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-01-14CMake: test option compatibility: Pango requires Xft.Albrecht Schlosser
Abort CMake configuration/generation if Xft is disabled or not found but Pango is requested because Pango requires Xft support. A detailed warning message is issued before the CMake generation is aborted. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12631 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-01-10CMake: enable building FLTK in a subdirectory of another project.Albrecht Schlosser
Basically replace CMAKE_XXX_DIR with CMAKE_CURRENT_XXX_DIR where XXX = SOURCE or BINARY. Patch proposal by cleanrock, FLTK PR #4: https://github.com/fltk/test-only/pull/4 Patch modified to fix target dirs for test programs and doxygen docs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12630 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-01-08MacOS + CMake: restore use of OPTION_APPLE_X11 under MacOS 10.13Manolo Gouy
It's necessary to compile with -mmacosx-version-min=10.8 and to link with -lfontconfig when Xft is used git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12627 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-12-28CMake: Fix missing WIN32 definition on Windows platforms.Albrecht Schlosser
Although some Windows compilers still #define WIN32, more and more standard compliant compilers only #define _WIN32. FLTK *did* #define WIN32 for all Windows targets with autoconf/configure, but that bit was lost for CMake builds. This is necessary until we replace WIN32 with _WIN32 throughout the Windows specific code. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12612 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-09-03Add new Fl_SVG_Image class to support scalable vector graphics images using ↵Manolo Gouy
the (modified) nanosvg software. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12413 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-07-18[CMake] Add an option to use High-DPI support (Windows only).Albrecht Schlosser
This option can be used with CMake to configure the experimental high-DPI support under Windows. The option may be removed once high-DPI support under Windows is complete. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12338 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-06-29CMake: fix potential compiler warning in test file.Albrecht Schlosser
clang reports: control reaches end of non-void function [-Wreturn-type] git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-06-29Update copyright year(s).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12282 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-06-29CMake: replace improperly used variables with correct ones.Albrecht Schlosser
CMake variables FLTK_SOURCE_DIR and FLTK_BINARY_DIR are only defined if the project name is exactly "FLTK" (all uppercase). These variables are generated (set) by CMake as <PROJECT_NAME>_SOURCE_DIR etc. The correct variables are CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR, respectively, which are always defined. This commit enables future changes of the FLTK project name, e.g. to "fltk" or "fltk-1.4.0" (a versioned project name), if we like... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12281 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-03-17[CMake] Fix Visual Studio header detection.Albrecht Schlosser
This commit fixes a CMake issue if CMake is invoked from a desktop icon or the Windows menu, i.e. not within the correct environment to find all required header files. We recommend to run CMake from a "Developer Command Prompt for Visual Studio X", but sometimes users click on their desktop icon and run CMake without the correct context. In this case some header files in the Windows SDK's are not found by CMake. The solution is to issue a warning and "fix" the header detection by faking that the headers were found, because they are always available in Visual Studio. The affected headers <locale.h> and <GL/glu.h> were set to "found" in the bundles IDE's in FLTK 1.3 as well, so there should be no issue with this fix. It is also recommended by the CMake folks, i.e. they suggest not to search for these special header files that are known to exist always. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12209 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-03-17[CMake] Remove unused header test HAVE_GL_GL_H (GL/gl.h).Albrecht Schlosser
Note: the test for OpenGL works slightly different with CMake vs. configure. The CMake (cache) variable HAVE_GL_GL_H was never used. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12203 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-02-08Rename test/help demo program to test/help_dialog.Albrecht Schlosser
This change avoids a name conflict with CMake's auto-generated target 'help' for "Unix Makefiles", "Ninja", and supposedly other generators as well. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-12-21X11 platform: Add optional use of the pango library to draw text, gaining ↵Manolo Gouy
the possibility to draw text in any script supported by Unicode. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12153 ea41ed52-d2ee-0310-a9c1-e6b18d33e121