diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-12-30 14:37:35 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-12-30 14:37:35 +0000 |
| commit | 4f5e6e7732553a9689f773715074fc14420f16b0 (patch) | |
| tree | 124fa87c6cf6f76443c061a598012ed7705d7ee3 /fluid | |
| parent | 17c48175927a5fa8eea52ef09090617b3e9b20f9 (diff) | |
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
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index 7fcd49950..86c7fba13 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -57,6 +57,10 @@ if(HAVE_XINERAMA) target_link_libraries(fluid ${X11_Xinerama_LIB}) endif(HAVE_XINERAMA) +if(HAVE_XRENDER) + target_link_libraries(fluid ${X11_Xrender_LIB}) +endif(HAVE_XRENDER) + if(APPLE) set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) set_target_properties(fluid PROPERTIES RESOURCE ${ICON_PATH}) |