Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
ad35a5c7
Unverified
Commit
ad35a5c7
authored
Aug 21, 2019
by
Dominik Charousset
Committed by
GitHub
Aug 21, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #883
Fix cmake output dir checks
parents
bc496094
f622e038
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
CMakeLists.txt
+2
-2
Jenkinsfile
Jenkinsfile
+1
-1
cmake/FindCAF.cmake
cmake/FindCAF.cmake
+2
-1
No files found.
CMakeLists.txt
View file @
ad35a5c7
...
@@ -159,14 +159,14 @@ endif()
...
@@ -159,14 +159,14 @@ endif()
# set module path appropriately
# set module path appropriately
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
# set binary output path if not defined by user
# set binary output path if not defined by user
if
(
EXECUTABLE_OUTPUT_PATH STREQUAL
""
)
if
(
NOT EXECUTABLE_OUTPUT_PATH
)
set
(
EXECUTABLE_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/bin"
)
set
(
EXECUTABLE_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/bin"
)
endif
()
endif
()
# set library output path if not defined by user, but always set
# set library output path if not defined by user, but always set
# library output path to binary output path for Xcode projects
# library output path to binary output path for Xcode projects
if
(
CMAKE_GENERATOR STREQUAL
"Xcode"
)
if
(
CMAKE_GENERATOR STREQUAL
"Xcode"
)
set
(
LIBRARY_OUTPUT_PATH
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
set
(
LIBRARY_OUTPUT_PATH
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
elseif
(
LIBRARY_OUTPUT_PATH STREQUAL
""
)
elseif
(
NOT LIBRARY_OUTPUT_PATH
)
set
(
LIBRARY_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib"
)
set
(
LIBRARY_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib"
)
endif
()
endif
()
...
...
Jenkinsfile
View file @
ad35a5c7
...
@@ -88,7 +88,7 @@ config = [
...
@@ -88,7 +88,7 @@ config = [
],
],
// Configures what binary the coverage report uses and what paths to exclude.
// Configures what binary the coverage report uses and what paths to exclude.
coverage:
[
coverage:
[
binary:
'build/caf-test'
,
binary:
'build/
bin/
caf-test'
,
relativeExcludePaths:
[
relativeExcludePaths:
[
'examples'
,
'examples'
,
'tools'
,
'tools'
,
...
...
cmake/FindCAF.cmake
View file @
ad35a5c7
...
@@ -91,7 +91,8 @@ foreach (comp ${CAF_FIND_COMPONENTS})
...
@@ -91,7 +91,8 @@ foreach (comp ${CAF_FIND_COMPONENTS})
/usr/local/lib
/usr/local/lib
/opt/local/lib
/opt/local/lib
/sw/lib
/sw/lib
${
CMAKE_INSTALL_PREFIX
}
/lib
)
${
CMAKE_INSTALL_PREFIX
}
/lib
${
CMAKE_INSTALL_PREFIX
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
mark_as_advanced
(
CAF_LIBRARY_
${
UPPERCOMP
}
)
mark_as_advanced
(
CAF_LIBRARY_
${
UPPERCOMP
}
)
if
(
"
${
CAF_LIBRARY_
${
UPPERCOMP
}}
"
if
(
"
${
CAF_LIBRARY_
${
UPPERCOMP
}}
"
STREQUAL
"CAF_LIBRARY_
${
UPPERCOMP
}
-NOTFOUND"
)
STREQUAL
"CAF_LIBRARY_
${
UPPERCOMP
}
-NOTFOUND"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment