TDE
/
tdebase
9
4
Fork 1
Code Issues 116 Pull Requests 10 Releases Wiki Activity
Labels Milestones

Improve detection of libXss, OpenGL, and libXext DPMS functionality, plus add include/link directories #156

Manually merged
aneejit1 merged 1 commits from bug/build-issues into master 4 years ago
Conversation 1 Commits 1 Files Changed 4
aneejit1 commented 4 years ago
Collaborator

Updates to:

  • ConfigureChecks.cmake - Change the test for libXss to look ask where the library is first, then find out if it has the required API function. The OpenGL test now includes the library paths and include paths returned from pkg_search_module.
  • kcontrol/energy/CMakeLists.txt - use the library flags and include paths in the API test, and include the link/include directories for libXext.
  • twin/compton-tde/CMakeLists.txt - complete the link/include directories to take into account the optional dependencies
  • tdm/backend/CMakeLists.txt - add missing link/include directories
  • nsplugins/viewer/CMakeLists.txt - add missing glib2 link directory
  • drkonqi/CMakeLists.txt - add missing libr link directory (this seems to the the only libr link in tdebase that isn't happy with the LINK_PRIVATE in tdelibs!).
Updates to: - ConfigureChecks.cmake - Change the test for libXss to look ask where the library is first, then find out if it has the required API function. The OpenGL test now includes the library paths and include paths returned from pkg_search_module. - kcontrol/energy/CMakeLists.txt - use the library flags and include paths in the API test, and include the link/include directories for libXext. - twin/compton-tde/CMakeLists.txt - complete the link/include directories to take into account the optional dependencies - tdm/backend/CMakeLists.txt - add missing link/include directories - nsplugins/viewer/CMakeLists.txt - add missing glib2 link directory - drkonqi/CMakeLists.txt - add missing libr link directory (this seems to the the only libr link in tdebase that isn't happy with the LINK_PRIVATE in tdelibs!).
aneejit1 changed title from WIP: Improve detection of libXss, OpenGL, and libXext DPMS functionality, plus add include/link directories to Improve detection of libXss, OpenGL, and libXext DPMS functionality, plus add include/link directories 4 years ago
SlavekB requested changes 4 years ago
SlavekB left a comment
Owner

There are issues that cause FTBFS.

There are issues that cause FTBFS.
ConfigureChecks.cmake Outdated
if( XSS_FOUND )
tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${XSS_INCLUDE_DIRS}" )
check_library_exists( Xss XScreenSaverQueryInfo ${XSS_LIBRARY_DIRS} HAVE_XSSLIB )
SlavekB commented 4 years ago
Owner

On standard systems, where libraries are located on system paths, ${XSS_LIBRARY_DIRS} will be empty. This causes the wrong number of arguments to call check_library_exists => it is necessary to use quotation marks around ${XSS_LIBRARY_DIRS}.

On standard systems, where libraries are located on system paths, `${XSS_LIBRARY_DIRS}` will be empty. This causes the wrong number of arguments to call `check_library_exists` => it is necessary to use quotation marks around `${XSS_LIBRARY_DIRS}`.
ConfigureChecks.cmake Outdated
endif( XSS_FOUND )
if( NOT HAVE_XSSLIB )
check_library_exists( Xext XScreenSaverQueryInfo ${XEXT_LIBRARY_DIRS} HAVE_XEXT_XSS )
SlavekB commented 4 years ago
Owner

Same as above => ${XEXT_LIBRARY_DIRS} needs to be in quotation marks.

Same as above => `${XEXT_LIBRARY_DIRS}` needs to be in quotation marks.
ConfigureChecks.cmake Outdated
tde_save( CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_LIBRARIES ${GL_LIBRARIES} )
tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${GL_INCLUDE_DIRS}" )
tde_save_and_set( CMAKE_REQUIRED_LINK_OPTIONS "${GL_LDFLAGS}" )
SlavekB commented 4 years ago
Owner

I have no idea in which version of CMake the use of the CMAKE_REQUIRED_LINK_OPTIONS variable was added, but this causes both Debian Wheezy and Debian Stretch to fail. CMAKE_REQUIRED_LIBRARIES seems to be necessary.

I have no idea in which version of CMake the use of the `CMAKE_REQUIRED_LINK_OPTIONS` variable was added, but this causes both Debian Wheezy and Debian Stretch to fail. `CMAKE_REQUIRED_LIBRARIES` seems to be necessary.
aneejit1 commented 4 years ago
Poster
Collaborator

It was 3.14 that it appeared in. I've just checked the dates on 3.14 and I hadn't realised how quickly cmake has been cranking up it's release numbers! 3.14 was only last year and they're already setting up to release 3.18. I've put the "CMAKE_REQUIRED_LIBRARIES" settings back and I'm currently testing to see if the "CMAKE_REQUIRED_FLAGS" variable will do the same job as "CMAKE_REQUIRE_LINK_OPTIONS"; if it does, I'll use FLAGS rather than LINK_OPTIONS.

It was 3.14 that it appeared in. I've just checked the dates on 3.14 and I hadn't realised how quickly cmake has been cranking up it's release numbers! 3.14 was only last year and they're already setting up to release 3.18. I've put the "CMAKE_REQUIRED_LIBRARIES" settings back and I'm currently testing to see if the "CMAKE_REQUIRED_FLAGS" variable will do the same job as "CMAKE_REQUIRE_LINK_OPTIONS"; if it does, I'll use FLAGS rather than LINK_OPTIONS.
kcontrol/energy/CMakeLists.txt Outdated
set( CMAKE_REQUIRED_LIBRARIES Xext )
set( CMAKE_REQUIRED_INCLUDES "${XEXT_INCLUDE_DIRS}" )
set( CMAKE_REQUIRED_LINK_OPTIONS "${XEXT_LDFLAGS}" )
SlavekB commented 4 years ago
Owner

Same as above – using CMAKE_REQUIRED_LIBRARIES is necessary.

Same as above – using `CMAKE_REQUIRED_LIBRARIES` is necessary.
aneejit1 commented 4 years ago
Poster
Collaborator

OK, the quotes are in and CMAKE_REQUIRED_LIBRARIES is back. I've switched to using CMAKE_REQUIRED_FLAGS instead of the newer CMAKE_REQUIRED_LINK_OPTIONS as that works just as well and is rather more backward compatible.

OK, the quotes are in and CMAKE_REQUIRED_LIBRARIES is back. I've switched to using CMAKE_REQUIRED_FLAGS instead of the newer CMAKE_REQUIRED_LINK_OPTIONS as that works just as well and is rather more backward compatible.
SlavekB approved these changes 4 years ago
SlavekB left a comment
Owner

Great, problems solved, now it looks good.

Great, problems solved, now it looks good.
aneejit1 closed this pull request 4 years ago
SlavekB deleted branch bug/build-issues 4 years ago
SlavekB added this to the R14.0.9 release milestone 4 years ago
The pull request has been manually merged as 036992eec5.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
GE/need-info
General - need additional info from contributor PR/keep-branch
Pull request - do not delete branch after merging PR/not-ok
Pull request - need fixing PR/rfc
Pull request - request for comments PR/update-trans
Pull request - update to translation files needed PR/wip
Pull request - work in progress RS/R14.0.x
Related to R14.0.x series RS/R14.1.x
Related to R14.1.x series SL/critical
Severity level - critical SL/major
Severity level - major SL/minor
Severity level - minor SL/normal
Severity level - normal SL/regression
Severity level - regression from previous version SL/trivial
Severity level - trivial SL/wishlist
Severity level - wishlist request ST/duplicate
Status - duplicate of another issue ST/invalid
Status - invalid report ST/notourproblem
Status - not our problem ST/rejected
Status - rejected ST/wontfix
Status - won't fix ST/worksforme
Status - works for me, unable to reproduce
No Label GE/need-info PR/keep-branch PR/not-ok PR/rfc PR/update-trans PR/wip RS/R14.0.x RS/R14.1.x SL/critical SL/major SL/minor SL/normal SL/regression SL/trivial SL/wishlist ST/duplicate ST/invalid ST/notourproblem ST/rejected ST/wontfix ST/worksforme
Milestone
Set milestone
Clear milestone
No items
No Milestone
R14.0.9 release
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tdebase#156
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'bug/build-issues'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes