Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ipaaca
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ramin Yaghoubzadeh Torky
ipaaca
Commits
c49795f2
Commit
c49795f2
authored
8 years ago
by
Ramin Yaghoubzadeh Torky
Browse files
Options
Downloads
Patches
Plain Diff
Third time's the charm
parent
eea86dcc
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ipaacalib/cpp/CMakeLists.txt
+5
-7
5 additions, 7 deletions
ipaacalib/cpp/CMakeLists.txt
with
5 additions
and
7 deletions
ipaacalib/cpp/CMakeLists.txt
+
5
−
7
View file @
c49795f2
...
@@ -122,18 +122,16 @@ endif(WIN32)
...
@@ -122,18 +122,16 @@ endif(WIN32)
set
(
LIBS
${
LIBS
}
${
PROTOBUF_LIBRARY
}
${
Boost_LIBRARIES
}
${
RSBLIBS
}
)
set
(
LIBS
${
LIBS
}
${
PROTOBUF_LIBRARY
}
${
Boost_LIBRARIES
}
${
RSBLIBS
}
)
if
(
!WIN32
)
if
(
NOT DEFINED WIN32
)
message
(
STATUS
"Adding extra options for building on POSIX"
)
set
(
LIBS
${
LIBS
}
pthread
)
if
(
DEFINED APPLE
)
if
(
DEFINED APPLE
)
message
(
STATUS
" - no flag needed on Mac"
)
message
(
STATUS
"No extra pthread flags needed on Mac"
)
# no special care required for our Apple clang thing
else
()
else
()
message
(
STATUS
"
-
extra flag for Linux"
)
message
(
STATUS
"
Adding
extra
pthread
flag
s
for Linux"
)
# needs -lpthread AND -pthread
# needs -lpthread AND -pthread
set
(
LIBS
${
LIBS
}
pthread
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-pthread"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-pthread"
)
endif
()
endif
()
endif
(
!
WIN32
)
endif
(
NOT DEFINED
WIN32
)
# Hide the rsb-induced boost-signals warning (FOR NOW)
# Hide the rsb-induced boost-signals warning (FOR NOW)
set
(
IPAACA_CXX_DEFINES
"
${
IPAACA_CXX_DEFINES
}
-DBOOST_SIGNALS_NO_DEPRECATION_WARNING"
)
set
(
IPAACA_CXX_DEFINES
"
${
IPAACA_CXX_DEFINES
}
-DBOOST_SIGNALS_NO_DEPRECATION_WARNING"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment