Commit Graph

17 Commits

Author SHA1 Message Date
Albrecht Schlosser
74187844a2 CMake/MSVC: remove confusing recommendation to rerun CMake
... if GL or locale headers are not found. These headers will be
  resolved by the Visual Studio SDK (backported from 1.4).

Also improve finding the GLEW library on Windows (named 'glew32')
  (backported from 1.4).
2023-12-07 19:49:31 +01:00
ManoloFLTK
8b35bd2d08 Remove OPTION_APPLE_X11 CMake option 2023-12-06 15:58:15 +01:00
Albrecht Schlosser
52a853c39c Backport CMake and related stuff from 1.4 (master)
- update formatting + documentation generation
- rename help-test.html to help_dialog.html
- update CMake files + Makefiles + related source files
- update fluid files + dependencies
2021-04-08 14:57:40 +02:00
Albrecht Schlosser
1eaf87b245 Minor CMake, docs, and test program updates
Fix bug in CMake/posixScandir.cxx (backported from 1.4).

Fix table structure in test/help-test.html (backported from 1.4).

Clarify that the deprecated forms compatibility *may* be removed in
FLTK 1.4
2020-09-19 19:47:18 +02:00
Albrecht Schlosser
ba56c33726 [CMake] Fix Windows dll build with Visual Studio generator.
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).

Todo: dll names and target directories may need some changes.

Todo: Shared libraries under Linux with CMake don't work yet:
/usr/bin/ld: ../lib/libfltk.a(Fl.cxx.o): relocation R_X86_64_32S against
  `.bss' can not be used when making a shared object; recompile with -fPIC



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11865 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-08-08 12:25:08 +00:00
Manolo Gouy
c4d004d5b3 THE best way to test for availability of dlsym().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11778 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-14 05:17:00 +00:00
Albrecht Schlosser
8d67e81b7d [CMake] Add missing end of file comment.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11776 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-13 22:29:17 +00:00
Albrecht Schlosser
ccd5f72035 [CMake] Fix restoration of CMAKE_REQUIRED_LIBRARIES.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11775 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-13 22:14:31 +00:00
Manolo Gouy
e2b6f1c7ec Fix cases where function dlsym() is not in library libdl
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11773 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-13 12:23:22 +00:00
Albrecht Schlosser
3beb45165a [CMake] config.h, part 2 - full compatibility with autoconf.
This commit makes the file config.h generated by CMake 100% compatible
with the one generated by autoconf/configure.

Fixes in this commit:
 - Set FLTK_DATADIR and FLTK_DOCDIR with the same default values.
   Note: needs some cleanup, option values are not clear, '/fltk'
   is currently appended in export.cmake (needs improvement).
 - Simulation of autoconf macro AC_HEADER_DIRENT for correct
   definition of only one 'dirent' header file.
 - Fix more function checks:
    - dlsym
    - png_get_valid
    - png_set_tRNS_to_alpha
 - Improve "Big Endian" check for __APPLE__ (mac_endianness.h).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10985 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-30 21:13:07 +00:00
Albrecht Schlosser
4f5e6e7732 Harmonize configure and CMake build system (part 1).
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-30 14:37:35 +00:00
Albrecht Schlosser
17c4817592 Add configure and CMake checks for X11/Xregion.h.
Configure and CMake now both check if X11/Xregion.h exists on the
build system and set HAVE_X11_XREGION_H in config.h accordingly.

src/Fl_Pixmap.cxx: modified to use the configure test as proposed by Manolo
in fltk.coredev on Dec 13 2015 in thread "Using X11 backend on OS X".


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10983 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-30 12:10:15 +00:00
Albrecht Schlosser
5f3f1c8bc6 [CMake] Add doxygen documentation generation (STR #3195).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10720 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-25 21:42:51 +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
fd4784a340 Set correct svn properties on CMake files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10466 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-11-22 00:42:44 +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