#1 cmake conversion

Merged
SlavekB merged 4 commits from feat/cmakeConv into master 4 months ago
cethyel commented 4 months ago
There is no content yet.
SlavekB reviewed 4 months ago
The code looks good, but the search sword includes and the library following the `pkg_search_module` seems unnecessary. I tested the code without this search and with the modifications mentioned below in the comments and everything was fine. Please test on your machine and make the adjustments according to the result.
@@ -0,0 +61,4 @@
61
+)
62
+
63
+set( LIBSWORD_LIBRARIES ${LIBSWORD_LIBRARY} )
64
+set( LIBSWORD_INCLUDE_DIRS ${LIBSWORD_INCLUDE_DIR} )
SlavekB

Why there is a separate search for LIBSWORD_INCLUDE_DIR and LIBSWORD_LIBRARY when LIBSWORD_INCLUDE_DIRS and LIBSWORD_LIBRARIES are already set by

pkg_search_module (LIBSWORD sword)

?

Why there is a separate search for `LIBSWORD_INCLUDE_DIR` and `LIBSWORD_LIBRARY` when `LIBSWORD_INCLUDE_DIRS` and `LIBSWORD_LIBRARIES` are already set by ``` pkg_search_module (LIBSWORD sword) ``` ?
@@ -0,0 +7,4 @@
7
+  ${CMAKE_CURRENT_SOURCE_DIR}
8
+  ${TDE_INCLUDE_DIR}
9
+  ${TQT_INCLUDE_DIRS}
10
+  ${LIBSWORD_INCLUDE_DIR}
SlavekB

Here you can use LIBSWORD_INCLUDE_DIRS, which is defined by pkg_search_module(…)

Here you can use `LIBSWORD_INCLUDE_DIRS`, which is defined by `pkg_search_module(…)`
@@ -0,0 +35,4 @@
35
+  LINK
36
+     tdecore-shared
37
+     tdeio-shared
38
+     ${LIBSWORD_LIBRARY}
SlavekB

Here you can use LIBSWORD_LIBRARIES, which is defined by pkg_search_module(…)

Here you can use `LIBSWORD_LIBRARIES`, which is defined by `pkg_search_module(…)`
SlavekB added the
PR/rfc
label 4 months ago
SlavekB approved these changes 4 months ago
After the final edits, the code is ready. Thank you for your efforts.
SlavekB removed the
PR/rfc
label 4 months ago
SlavekB deleted branch feat/cmakeConv 4 months ago
SlavekB added this to the R14.0.6 release milestone 4 months ago

Reviewers

SlavekB approved these changes 4 months ago
The pull request has been merged.
Sign in to join this conversation.
Loading…
Cancel
Save
There is no content yet.