Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Restore <autowiring/signal.h> #1008

Merged
merged 4 commits into from Oct 18, 2016
Merged

Restore <autowiring/signal.h> #1008

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce83ab9
Restore <autowiring/signal.h> for customers
jdonald Oct 12, 2016
e79a23e
Limit adding unnecessary include dirs
jdonald Oct 12, 2016
d5548c6
Fix out-of-source builds via s/BINARY/BUILD and src/autowiring
jdonald Oct 18, 2016
ae732c2
Avoid signal.h conflict more so by limiting src/autowiring in paths
jdonald Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/autowiring/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -148,6 +148,7 @@ set(Autowiring_SRCS
Parallel.cpp
registration.h
SatCounter.h
signal.h
signal_base.h
SlotInformation.cpp
SlotInformation.h
Expand Down Expand Up @@ -244,7 +245,7 @@ target_include_directories(
"${PROJECT_SOURCE_DIR}/contrib/autoboost"
PUBLIC
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
"$<BUILD_INTERFACE:${PROJECT_BUILD_DIR}/src>"
Copy link
Contributor

Choose a reason for hiding this comment

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

This causes a build error, "AutowiringVersion.h: No such file or directory."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's passing on Travis though . I have tested both in-source and out-of-source builds.

What are the steps to reproduce the error you're seeing?

Copy link
Contributor

Choose a reason for hiding this comment

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

I made autowiring-build directory and ccmake ../autowiring inside the directory. PROJECT_BUILD_DIR is null in my Mac and Linux box.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Hyoung and I figured it out it was working on Travis only because that tests in-source builds.

INTERFACE
"$<INSTALL_INTERFACE:include>"
)
Expand Down
2 changes: 2 additions & 0 deletions src/autowiring/signal.h
View file
Open in desktop
@@ -0,0 +1,2 @@
// Copyright (C) 2012-2016 Leap Motion, Inc. All rights reserved.
#include "auto_signal.h"