TDE
/
kbarcode
6
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Labels Milestones

cmake conversion #3

Merged
SlavekB merged 1 commits from feat/cmakeConv into master 5 years ago
Conversation 1 Commits 1 Files Changed 10
Ghost commented 5 years ago

I've added a man page taken from your Debian building system.
The download location for kbarcode-2.0.0.pdf has been set to "gentoo.ussg.indiana.edu", this could be change for an other location (wiki) later.

I've added a man page taken from your Debian building system. The download location for kbarcode-2.0.0.pdf has been set to "gentoo.ussg.indiana.edu", this could be change for an other location (wiki) later.
Ghost added the PR/rfc label 5 years ago
SlavekB reviewed 5 years ago
SlavekB left a comment
Owner

Please add the build options and adjust the tests as mentioned in the note below.

Please add the build options and adjust the tests as mentioned in the note below.
ConfigureChecks.cmake Outdated
#### check for headers
check_include_file( "barcode.h" _ENABLE_NATIVE_GNU_BARCODE )
check_include_file( "kjs/interpreter.h" USE_JAVASCRIPT )
SlavekB commented 5 years ago
Owner

We should define options such as WITH_NATIVE_GNU_BARCODE (OFF by default) and WITH_JAVASCRIPT, and these tests should end by tde_message_fatal if the conditions are not met.

We should define options such as `WITH_NATIVE_GNU_BARCODE` (OFF by default) and `WITH_JAVASCRIPT`, and these tests should end by `tde_message_fatal` if the conditions are not met.
SlavekB commented 5 years ago
Owner

There are additional issues:

  1. Since TDE includes neither TQt include does not need to be on the usual paths, test for kjs/interpreter.h fails – we need to set CMAKE_REQUIRED_INCLUDES.
  2. Since kjs/interpreter.h is intended for C++, the check_include_file test fails because the build with C fails – we need to use check_include_file_cxx.

This means to add to CMakeLists.txt:

include( CheckIncludeFileCXX    )

And in ConfigureChecks.cmake change test:

if( WITH_JAVASCRIPT )
  tde_save( CMAKE_REQUIRED_INCLUDES )
  list( APPEND CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} )
  check_include_file_cxx( "kjs/interpreter.h" USE_JAVASCRIPT )
  tde_restore( CMAKE_REQUIRED_INCLUDES )
endif( )
There are additional issues: 1. Since TDE includes neither TQt include does not need to be on the usual paths, test for `kjs/interpreter.h` fails – we need to set `CMAKE_REQUIRED_INCLUDES`. 2. Since `kjs/interpreter.h` is intended for C++, the `check_include_file` test fails because the build with C fails – we need to use `check_include_file_cxx`. This means to add to CMakeLists.txt: ``` include( CheckIncludeFileCXX ) ``` And in ConfigureChecks.cmake change test: ``` if( WITH_JAVASCRIPT ) tde_save( CMAKE_REQUIRED_INCLUDES ) list( APPEND CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} ) check_include_file_cxx( "kjs/interpreter.h" USE_JAVASCRIPT ) tde_restore( CMAKE_REQUIRED_INCLUDES ) endif( ) ```
SlavekB reviewed 5 years ago
config.h.cmake Outdated
SlavekB commented 5 years ago
Owner

A little typo in the comment – closing > is one word later.

A little typo in the comment – closing > is one word later.
SlavekB reviewed 5 years ago
SlavekB left a comment
Owner

Sorry, but there are some new shortcomings – see comments.

Sorry, but there are some new shortcomings – see comments.
CMakeLists.txt Outdated
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
option( WITH_NATIVE_GNU_BARCODE "Enable GNU Barcode" OFF )
option( WITH_JAVASCRIPT "Enable Javascript" OFF )
SlavekB commented 5 years ago
Owner

These are WITH_… options – they belong to the section ##### optional stuff. For WITH_JAVASCRIPT please use default value ${WITH_ALL_OPTIONS}.

These are `WITH_…` options – they belong to the section `##### optional stuff`. For `WITH_JAVASCRIPT` please use default value `${WITH_ALL_OPTIONS}`.
ConfigureChecks.cmake Outdated
list( APPEND CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} )
check_include_file_cxx( "kjs/interpreter.h" HAVE_JAVASCRIPT )
if( HAVE_JAVASCRIPT )
set( USE_JAVASCRIPT 1 )
SlavekB commented 5 years ago
Owner

Here it would be good to add also set( NO_KJS_EMBED 1 ).

Here it would be good to add also `set( NO_KJS_EMBED 1 )`.
ConfigureChecks.cmake Outdated
endif( HAVE_JAVASCRIPT )
else()
set( USE_JAVASCRIPT false )
tde_restore( CMAKE_REQUIRED_INCLUDES )
SlavekB commented 5 years ago
Owner

This tde_restore is misplaced – it belongs before else( )

This `tde_restore` is misplaced – it belongs before `else( )`
config.h.cmake Outdated
#cmakedefine _ENABLE_NATIVE_GNU_BARCODE @_ENABLE_NATIVE_GNU_BARCODE@
/* Define to 1 if you have <kjs/interpreter.h> header file. */
#cmakedefine USE_JAVASCRIPT @USE_JAVASCRIPT@
SlavekB commented 5 years ago
Owner

Here, #cmakedefine NO_KJS_EMBED should also be set.

Here, `#cmakedefine NO_KJS_EMBED` should also be set.
SlavekB commented 5 years ago
Owner

Finished little things:

  1. Rebased to current HEAD.
  2. Fixed shortcomings in patch for cmake options.
  3. Added patch for automake options.
  4. Added patch for ascii cast.

Everything seems to be ready for merge.

Finished little things: 1. Rebased to current HEAD. 2. Fixed shortcomings in patch for cmake options. 3. Added patch for automake options. 4. Added patch for ascii cast. Everything seems to be ready for merge.
SlavekB removed the PR/rfc label 5 years ago
SlavekB approved these changes 5 years ago
SlavekB left a comment
Owner

Everything seems to be ready for merge.

Everything seems to be ready for merge.
SlavekB closed this pull request 5 years ago
SlavekB deleted branch feat/cmakeConv 5 years ago
SlavekB added this to the R14.0.6 release milestone 5 years ago
The pull request has been merged as 20a84daca2.
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.6 release
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/kbarcode#3
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'feat/cmakeConv'

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

No
Yes