summaryrefslogtreecommitdiff
path: root/CMake
AgeCommit message (Collapse)Author
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
2016-12-06[CMake] Rewrite pthreads checks for compatibility with configure.Albrecht Schlosser
Main point: pthreads must not be checked under Windows (e.g. MinGW) since Windows always uses native Windows threads (unless Cygwin is used). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12138 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-12-01Add --enable-print option to configure to allow building without print ↵Manolo Gouy
support on X11 platforms. Also, the NO_PRINT_SUPPORT preprocessor variable is renamed FL_NO_PRINT_SUPPORT. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12131 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-12-01MacOS platform: restore CMake building with OPTION_APPLE_X11 on.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12128 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-08-05Fix CMake building under Apple platform that used to set HAVE_GL_GLU_H to 0Manolo Gouy
On the Mac OS platform, file glu.h is not in a directory called GL. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-09Clarification and better documentation of ABI version configuration.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11804 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-14THE best way to test for availability of dlsym().Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11779 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-13[CMake] Fix restoration of CMAKE_REQUIRED_LIBRARIES.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11777 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-06-13Fix cases where function dlysym() is not in library libdl.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11774 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-05[CMake] Mark OPTION_USE_POLL as advanced.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11292 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-10More device and driver setup.Matthias Melcher
- building the base structure to have a screen driver, a window driver, and a system driver - still pondering over the exact implementation git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11147 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-10Starting CMake config to blend out filechoose and filename handling (shrins ↵Matthias Melcher
fltk massively if not needed) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11146 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-05New CMake option OPTION_PRINT_SUPPORT turned ON by defaultManolo Gouy
When the option is off, file config.h defines NO_PRINT_SUPPORT which in turn produces a library without print support, that is, class Fl_Printer does nothing. When off, the FLTK library is somewhat smaller. Can be turned off only when the X11 library is used. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11127 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-03Support of OPTION_APPLE_X11 by CMake: do not use hard-coded pathsManolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11125 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-02To support OPTION_APPLE_X11Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11122 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-30Bump version numbers for next minor release: FLTK 1.4.0.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11088 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-30[CMake] config.h, part 2 - full compatibility with autoconf.Albrecht Schlosser
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-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-30Add configure and CMake checks for X11/Xregion.h.Albrecht Schlosser
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-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-12-26Mac OS + CMake: this file is used by CMake to build the Info.plist files of ↵Manolo Gouy
the application bundles it creates. This makes these apps support retina displays, because the file contains <key>NSHighResolutionCapable</key> <true/> git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-12Fix fltk-config for CMake build.Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10787 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-12Make FL_ABI_VERSION configurable (STR #3161).Albrecht Schlosser
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-04-25[CMake] Add option to suppress CMake regeneration (STR #3215).Albrecht Schlosser
This option is marked as advanced and only available with CMake >= 3.0. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10721 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-25[CMake] Add doxygen documentation generation (STR #3195).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10720 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-25[CMake] Update fltk-config generation for AIX (STR #3217).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10719 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-25[CMake] Fix CMake build's fltk-config (STR #3217).Albrecht Schlosser
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10716 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