Commit Graph

43 Commits

Author SHA1 Message Date
Albrecht Schlosser
c7b5d61eb0 CMake: add macro fl_debug_var to debug variables.
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-09 20:51:15 +00:00
Albrecht Schlosser
7aef0cad39 CMake: enable building FLTK in a subdirectory of another project.
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-10 20:49:03 +00:00
Albrecht Schlosser
3eb6b7ea58 CMake: replace improperly used variables with correct ones.
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-06-29 17:51:27 +00:00
Albrecht Schlosser
92d3e1e03a Update minimum required CMake version from 2.6 to 2.6.3.
Verified build with CMake 2.6.3 (failed with 2.6.2).

We need 2.6.3 for "unset" (unknown command in 2.6.2 and earlier).

CMake 2.6.2 also fails when parsing nested brackets in logical
expressions like the following one:

  if((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11397 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-22 00:23:25 +00:00
Albrecht Schlosser
9adb181156 Make FL_ABI_VERSION configurable (STR #3161).
This commit adds the configure option --with-abiversion and the CMake option
OPTION_ABI_VERSION. Both options can be set e.g. to 10304 to build with
FL_ABI_VERSION = 10304 (FLTK 1.3.4).

For IDE builds there are new files ide/<IDE-NAME>/FL/abi-version.h that
can be edited to change the ABI version before the FLTK lib is built.
Note that this file MUST be copied to the include/FL directory if the
IDE-built library is to be installed.

The default is FL_ABI_VERSION = FL_MAJOR*10000 + FL_MINOR*100 + 0, i.e.
10300 for all FLTK 1.3.x versions to keep binary compatibility (ABI).

Todo: more tests and more documentation.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-12 19:23:55 +00:00
Albrecht Schlosser
e23bf0b768 [CMake] Fix CMake build's fltk-config (STR #3217).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10716 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-25 13:50:27 +00:00
Albrecht Schlosser
6390a0e09e [CMake] Improve installation, support DESTDIR, and more (STR #3149).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-16 14:30:27 +00:00
Albrecht Schlosser
078df04bfd CMake: Prevent annoying warning under Cygwin.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10368 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-09 16:03:56 +00:00
Albrecht Schlosser
318c3619dc CMake enhancements, as discussed in STR #3055.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-27 00:41:06 +00:00
Albrecht Schlosser
f352740953 Split CMake files for better maintenance, as discussed in fltk.general.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10098 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-02-09 18:41:29 +00:00
Albrecht Schlosser
1396a79651 CMake/MinGW: Fix missing -pthread linker option for MinGW build.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-02-02 00:49:50 +00:00
Albrecht Schlosser
c92e58fdac CMake: Fix linker issues on OS X and Arch Linux (STR #3045).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10091 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-02-02 00:41:01 +00:00
Albrecht Schlosser
4d4ffb4d0a Add CMake fixes for OS X build from Rob McDonald.
See thread: [fltk.general] Embedding FLTK in project.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-10 10:33:25 +00:00
Albrecht Schlosser
738563f973 Fixed missing libdl dependency in CMake builds (STR #2977).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-03 16:42:21 +00:00
Pierre Ossman
1d6cc80d59 STR 2636. Add ability to get notifications whenever the
clipboard changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9974 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-09-11 12:54:40 +00:00
Albrecht Schlosser
e9767cce34 Removed autoconf/configure and CMake tests and defines for
unused function strtoll() [resolves one part of STR #2965].


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9923 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-05-22 10:40:58 +00:00
Manolo Gouy
703d78c4b0 Fixed CMake use for Mac OS and the scandir() function.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9679 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-09-13 14:19:01 +00:00
yuri
3086c07eec fix STR #2764
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-11-12 19:41:13 +00:00
Greg Ercolano
4f4a8fc3c7 Modifications to all LGPL headers for STR #2685.
(to clarify static exception LGPL by changing license references)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-07-19 04:49:30 +00:00
Manolo Gouy
bc509d32eb Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO and USE_CAIRO
by FLTK_USE_CAIRO everywhere.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-06 10:24:58 +00:00
Manolo Gouy
874bca74f5 Mac OS X: removed all uses of Carbon (except for older OS versions) and re-organized
text input around the NSTextInput protocol.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-03 16:50:34 +00:00
Manolo Gouy
dbb7be0fee Mac OS X: removed dependency from AudioToolbox.framework by calling NSBeep() from Cocoa.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8135 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-29 11:33:42 +00:00
Albrecht Schlosser
8c56fc7e22 Updated CMake files with patches from Michael Surette (STR #2317).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7919 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-30 10:34:43 +00:00
Manolo Gouy
c077050d05 Fixed cmake under Mac OS X
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7867 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-17 16:47:54 +00:00
Albrecht Schlosser
b24875d8cd One more CMake fix.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7461 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-06 20:36:34 +00:00
Albrecht Schlosser
a0d26b634a Mostly rewritten CMake files by Michael Surette. They are more complete
than what we had previously, but may need some more testing. The latest
changes (removing old APPLE_QD definitions and code) might need another
update.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7451 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-05 22:33:58 +00:00
Greg Ercolano
20a68afbc3 Applied vs8.patch to solve STR#2244.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7197 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-03 07:26:19 +00:00
Albrecht Schlosser
1c6e95b545 CMake support: added platform test for HAVE_SCANDIR_POSIX,
added $Id$ tags and added copyright to (some of the) CMake files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7012 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-16 14:18:18 +00:00
Albrecht Schlosser
012c5db243 Fixed minor syntax error in CMakeLists.txt (STR #2299)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6974 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-12-21 17:14:52 +00:00
Albrecht Schlosser
cec4292c32 removed wsock32 from CMakeLists.txt, because it's not needed any more
(STR #2244)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6859 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-09-13 09:25:04 +00:00
Matthias Melcher
2245a98873 Made CMake work on OS X Snow Leopard by removing the assumption that a Unix system (which includes OS X) automatically is an X11 system (which OS X is not).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6857 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-09-09 21:37:51 +00:00
Albrecht Schlosser
1b2df88ed0 More CMake updates (STR #2244):
- added missing files in src/CMakeLists.txt
 - added -DUSE_X11 for Unix builds
 - added new test/unittests program

Thanks to Yassine (yostane) for testing and helping to update the CMake files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6847 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-08-30 21:15:43 +00:00
Greg Ercolano
af570d2be4 Solves STR #2244.
See also, fltk.general newgroup thread:
    Subject: "probelm to build fltk 1.3 svn using msys, gcc3.4 and cmake"
    (Dates 08/28/09 - 08/29/09)

Applied Yostane's zip file mods to the two CMakeLists.txt to support 
msys/gcc3.4/cmake environment. Verified consistency, fixed indents.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-08-30 03:45:52 +00:00
Fabien Costantini
e77a5d14d8 wsock32 static lib dependency removal from win build files.
error msg if wsock load fails changed by Fl::fatal() API use.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-08-28 17:33:56 +00:00
Matthias Melcher
232ef4e159 Updated 1.3 with changes from 1.1.9
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6099 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-04-12 19:16:19 +00:00
Matthias Melcher
a333f29b91 STR #1123: Fixed include path in CMake build. I don't use CMake, but since this patch was contributed by the same company that *wrote* CMake, I have a good feeling that they know what they are doing.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4715 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-12-16 15:22:29 +00:00
Dejan Lekic
1cd06f3ad0 This commit contains patch submitted by "fltk.x0" (thanks fltk.x0!) in the middle of May this year - STR #863. Also small change in fluid.cxx - time.h was needed for successful build on MinGW.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4468 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-08-06 05:02:56 +00:00
Matthias Melcher
458d1dc75d Attempt to make 'localeconv()' part of the configuration process. VC6 works, but I'll need feedback for all other platforms... . Trying OS X in a few minutes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4454 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-07-24 18:41:30 +00:00
Michael R Sweet
5ca7674da3 Updates to cmake project files (STR #813)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-05-13 03:05:08 +00:00
Michael R Sweet
3ee9c50180 CMake build fixes (STR #724)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4047 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 20:26:22 +00:00
Michael R Sweet
1f2456132e Cmake updates (STR #645)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:17:50 +00:00
Michael R Sweet
ca005c4067 Documentation updates (STR #568)
More CMake updates (STR #499)

The Watcom C++ compiler needed a small change (STR #567)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3869 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-10-18 20:29:58 +00:00
Michael R Sweet
1ca225e19d Added (unsupported) CMake files (STR #499)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3829 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-09-13 02:12:41 +00:00