Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add CMakeLists.txt to support PAL Tools #61

Merged
merged 3 commits into from
Feb 16, 2017
Merged

Add CMakeLists.txt to support PAL Tools #61

merged 3 commits into from
Feb 16, 2017

Conversation

teetak01
Copy link
Contributor

No description provided.

@teetak01
Copy link
Contributor Author

Here is cleaned up version of the other PR. This should be enough.

@teetak01
Copy link
Contributor Author

@tommikas @jupe

@teetak01
Copy link
Contributor Author

Added yotta_ignore for backwards compatibility

Copy link

@RomanSaveljev RomanSaveljev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, but someone else should approve (insignificant experience with cmake)

@tommikas
Copy link

I don't have experience with cmake either, but this is sliiightly failing to build at the moment.

@teetak01
Copy link
Contributor Author

Fixed the syntax in .yotta_ignore

Copy link

@tommikas tommikas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CMakeLists.txt Outdated
FILE(GLOB MBED_TRACE_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/source/*.c"

)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't the above 4 lines be just one line?

CMakeLists.txt Outdated
project(mbedTrace)


include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? There's no include directory here, the header is in mbed-trace.

CMakeLists.txt Outdated


include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does cmake need this? There's no source files directly in the root directory.

@tommikas tommikas merged commit af5f59c into master Feb 16, 2017
@tommikas tommikas deleted the LinuxPort2 branch February 16, 2017 11:55

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mbed-trace/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/mbed-client-libservice/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why two includes from libservice?

tommikas pushed a commit that referenced this pull request Jun 16, 2017
* origin/master: (22 commits)
  output/ added to gitignore list (#66)
  Added include_directories(${CMAKE_CURRENT_SOURCE_DIR}/) include to resolve compilation error for Linux. (#63)
  Ensure tr_array doesn't print <null> when len == 0 (#65)
  Add CMakeLists.txt to support PAL Tools (#61)
  Fix header documentation (#58)
  Update README.md (#57)
  Provide environment-agnostic configuration macros. (#54)
  Flash size can be limited by defining MBED_TRACE_MAX_LEVEL
  Use temp variable in mutex release loop (#52)
  Fix race condition when unlocking mutex
  Add instructions for enabling the library in mbed OS 5. (#50)
  document update. (#47)
  Allow setting mutex locking/unlocking callbacks before trace init. (#46)
  Ipv6 helpers update (#44)
  Fix disabling traces through the YOTTA_CFG_MBED_TRACE flag. (#45)
  Deprecate the misnamed YOTTA_CFG_MTRACE_TMP_LINE_LENGTH flag, which is to be removed in the next release. (#43)
  Changed dummy definitions to match the actual functions' return types (#40)
  FEA_TRACE_SUPPORT flag is always set when traces are enabled. (#39)
  Release merge to master (#38)
  Add nanostack-libservice lib to CMakeLists (#31)
  ...
@jupe jupe added this to the v1.2.2 milestone Jul 5, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants