Commit Graph

30 Commits

Author SHA1 Message Date
Matthias Melcher
42555053a1 More Android changes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12699 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-02 20:03:04 +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
16774ddc4e Rename test/help demo program to test/help_dialog.
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
2017-02-08 02:06:52 +00:00
Albrecht Schlosser
ace85426bc [CMake] Improve sound support detection.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11781 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-14 11:00:29 +00:00
Manolo Gouy
cba54044a7 Fix building on FreeBSD that failed for test programs requiring audio output.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11769 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-07 10:39:15 +00:00
Manolo Gouy
a6b31a05af CMake on Mac OS: copy support files to application bundles.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11740 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-05-15 14:07:48 +00:00
Albrecht Schlosser
020a96b4a8 Fix more compiler warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-05 21:15:45 +00:00
Albrecht Schlosser
3f401f4477 Add Ian's offscreen test program.
Same commit as branch-1.3, svn r11287.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11288 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-05 00:53:40 +00:00
Albrecht Schlosser
b69fbf21bf [CMake only] Add examples/fltk-versions to test programs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11135 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-09 01:22:51 +00:00
Albrecht Schlosser
6cc67c18f2 Reflect changes in new Windows IDE (Debug Mode).
Windows executables in Debug mode don't have the trailing 'd'
they used to have with the old (bundled) IDE files.
The removal of 'd' (e.g. from askd.exe) was removed.

Also prepared test/CMakeLists.txt for a better installation
path of test files (copied from the source directory).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11090 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 21:00:12 +00:00
Manolo Gouy
3ec8bab10e CMake build on Mac OS: r10688 was not a good move because it works with
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-08 12:16:52 +00:00
Manolo Gouy
4b5b11a1cb CMake building on Mac OS: use a simpler way to put files within app bundles.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10688 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-08 11:37:14 +00:00
Albrecht Schlosser
b89035f360 Add new animated demo to CMakeLists.txt, update .gitignore and svn props.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10643 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-03-18 13:31:59 +00:00
Albrecht Schlosser
24dd515f30 [CMake] Fix creation of example directory when copying support files.
This was a regression introduced in svn r 10573 that affects new builds,
when the target directory for test files (bin/examples) doesn't exist yet.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10577 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-13 12:16:38 +00:00
Albrecht Schlosser
5b801eae16 [CMake] Copy support files for demo programs to build directory (incomplete).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10573 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-11 15:15:46 +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
eb1af07952 Add Fl_Window::wait_for_expose() and test program (STR #3124).
Also modified .gitignore, svn-properties, Makefile and CMake-Files.

Todo: test/twowin.cxx and test/windowfocus.cxx need to be added to ide files
(MS VC++ and Xcode).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10339 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-26 23:58:05 +00:00
Pierre Ossman
f58b1a91b3 Add ability to set custom icons for windows. STR #2816.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10197 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-06-16 11:39:32 +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
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
Albrecht Schlosser
6bd9230bcf Updated CMake files and removed now obsolete test/tree.cxx and
test/tree.h files.
Note: CMake not yet tested with these modifications.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7675 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-07-10 14:25:46 +00:00
Albrecht Schlosser
1ad2e5bf81 Added missing examples in CMake files: applied missing_examples_7473.patch
(STR #2317).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7528 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-18 15:09:04 +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
Albrecht Schlosser
ff861ae5c0 Added missing table and tree examples to CMake build files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7011 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-15 16:07:19 +00:00
Albrecht Schlosser
ec908230a1 Added Fl_Table, Fl_Tree, and Fl_Native_File_Chooser CMake build files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7010 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-15 16:02:00 +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
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