summaryrefslogtreecommitdiff
path: root/CMake/macros.cmake
AgeCommit message (Collapse)Author
2020-07-15CMake: refactor and reformat CMake filesAlbrecht Schlosser
- raise minimum CMake version from 2.6.3 to 3.2.3 (Jun 01, 2015) - indent all CMake files according to the CMP (2 col.) - refactor FLTK version number definitions and usage - unify CMake and autoconf/configure variable names: - FL_VERSION -> FLTK_VERSION - FL_MAJOR_VERSION -> FLTK_VERSION_MAJOR - etc. for _MINOR_ and _PATCH_, respectively - note: this does not affect FL_VERSION etc. in source code - generate "export headers" for all libraries (experimental: OFF) - port some forgotten goodies from branch-1.3 to master - merge and improve macro 'create_example' (WIP) - remove "temporary" options and code for older CMake versions - include and use 'GenerateExportHeader' (experimental, WIP: OFF) - note: created header files are not yet used - build only *one* DLL with Visual Studio (tested, works) - similar to the bundled IDE projects in 1.3.x - add some dynamically linked test/demo programs ('*-shared') if shared libraries are built (WIP) - split 'macros.cmake': use one file per macro
2020-07-06Remove $Id$ tags, update URL's, and moreAlbrecht Schlosser
- remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers.
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
2019-06-04Fix typo in CMake macro FL_ADD_LIBRARYAlbrecht Schlosser
2019-01-17Android CMake: icons, docs, more appsMatthias Melcher
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
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-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-08-09[CMake] Fix Windows dll build with Visual Studio generator.Albrecht Schlosser
Now you can set OPTION_BUILD_SHARED_LIBS:BOOL=ON to build FLTK dll's with Visual Studio. Tested and works (Visual Studio 2010 + 2015). Note: Linux fixes included, tested and works (Ubuntu). Todo: dll names and target directories may need some changes. We really need to get rid of that "_SHARED" suffix in .so names. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11867 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-27[CMake] Remove redundant linking in CMake build process (STR #3298).Albrecht Schlosser
[CMake] Simplify CMake build files, remove redundancies. Ports of branch-1.3, svn r 11442 and 11444: Remove src/fl_call_main.c from non-Windows (static) libraries. It would be an empty object file anyway. Use CMake variables to set up used files and linked libraries to remove redundancies. All files and libs are used only in the definition of CMake variables and used later in static and shared builds, resp. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11447 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-26[CMake] Fix library name (Debug mode), add fluid dependencies.Albrecht Schlosser
The library name in Debug mode must only be 'libname'd.a if the build is with MSVC; all other builds never appended the 'd' suffix to the name. This is also documented (see lib/README). Fluid did not regenerate the .cxx and .h files if the .fl file was changed. The DEPENDS keyword adds the necessary dependency. The MAIN_DEPENDENCY keyword "also suggests to Visual Studio generators where to hang the custom command" according to CMake docs. Ported from branch-1.3, svn r11430. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11431 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-03Made Pico/SDL setup compile and run some minimal code.Matthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11274 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-02Add support for SDL as a base library on OS X.Matthias Melcher
This commit adds the basic setup in CMake to allow SDL as a base library for FLTK on OS X (and probably for other platforms as well). The SDL library driver set is derived from yet another new driver set named 'Pico'. 'Pico' is a base class for a driver that will allow porting of FLTK with the tinyest amount of effort. This implementation of the SDL driver shall be documented very well to explain the porting process. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11262 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-02Stop using ide/Xcode4/plists/editor-Info.plist because ide will be removed.Manolo Gouy
This file is moved to the test/ directory. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11120 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29CMake] Work around CMake bug in CMake versions 3.4.x.Albrecht Schlosser
CMake versions 3.4.x crash when using fltk_wrap_ui, a built-in CMake command. According to the CMake devs this will be fixed in CMake 3.5. However, since fltk_wrap_ui is no longer necessary (it can replaced by custom build commands) and some Linux distributions deploy CMake 3.4.x we decided to use an own replacement function. This makes sure that FLTK can be built with CMake 3.4.x, but FLTK users may still have to rewrite their own CMake files to not use fltk_wrap_ui. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11082 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-31Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11Manolo Gouy
to build an X11-using version of FLTK on the Mac OS platform. This matches the recent support of the --enable-x11 option by the configure script on the mac. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-30Harmonize configure and CMake build system (part 1).Albrecht Schlosser
The files "config.h" generated by configure and CMake are now almost identical, except a few comments and some still missing or failing config tests, for instance checks for some functions in libraries. [Note: tested and compared on Linux.] configh.cmake.in: Fixed many #cmakedefine and #cmakedefine01 statements so they #define their variables as 0 or 1, or /* #undef */ it, resp., as it is done in the configure build. Added tests: - libXrender Fixed tests: - function glXGetProcAddressARB Todo (still failing tests in CMake): - HAVE_PNG_GET_VALID - HAVE_PNG_SET_TRNS_TO_ALPHA - HAVE_DLSYM Other remaining issues: - compiler flags introduced in configure/make build - HAVE_SYS_NDIR_H - maybe missing test in configure ? - HAVE_SYS_DIR_H - maybe missing test in configure ? - HAVE_NDIR_H - maybe missing test in configure ? - WORDS_BIGENDIAN and #include <mac_endianness.h> ... i.e. Mac OS X specific #include needed or not ? git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10984 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-29Mac OS: add if(APPLE condition to Mac OS-specific target property.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10982 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-29Mac OS: Enhanced the application bundle for the editor demoManolo Gouy
so it is launchable by dropping any file on its icon. This is done both for the configure/make and the CMake build systems (the Xcode build system did that already). The editor demo is the only one calling fl_open_callback(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-10CMake: Remove installation of example programs (STR #3194).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10695 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-08CMake build on Mac OS: r10688 was not a good move because it works withManolo Gouy
the makefiles generator but not with the Xcode generator. Stepping back one commit. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10689 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-08CMake building on Mac OS: use a simpler way to put files within app bundles.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10688 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-08Make building on Mac OS: compile with -DUSING_XCODE only for demo.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10687 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-08CMake building on Mac OS: the demo program uses and finds demo.menu in its ↵Manolo Gouy
bundle. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10686 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-07Corrected typo: resources --> ResourcesManolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10685 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-07CMake for Mac OS: the generated Xcode project creates bundled test ↵Manolo Gouy
applications and uses appropriate icons for blocks, checkers, and sudoku. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10683 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-16[CMake] Improve installation, support DESTDIR, and more (STR #3149).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-11-22Set correct svn properties on CMake files.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10466 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-12[CMake] Fix match of .fl files in macro CREATE_EXAMPLE.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10373 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-09CMake: rename reserved target name "help" (CMake 2.8.12 and later).Albrecht Schlosser
The executable built is still help(.exe). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10370 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-09Revert unintentionally committed files.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10369 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-09CMake: Prevent annoying warning under Cygwin.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10368 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-27Add forgotten file for CMake enhancements (STR #3055).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10343 ea41ed52-d2ee-0310-a9c1-e6b18d33e121