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
f983dd0c
Commit
f983dd0c
authored
Jan 03, 2020
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'glvi/xcode'
parents
b38e342b
7eed4a1c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
16 deletions
+33
-16
CMakeLists.txt
CMakeLists.txt
+14
-13
cmake/dummy.cpp
cmake/dummy.cpp
+10
-0
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+3
-1
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+3
-1
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+3
-1
No files found.
CMakeLists.txt
View file @
f983dd0c
...
...
@@ -13,6 +13,10 @@ include(CheckCSourceRuns) # Check whether compiler produces binaries
include
(
GNUInstallDirs
)
# Sets default install paths
include
(
GenerateExportHeader
)
# Auto-generates dllexport macros
# -- project-specific CMake settings -------------------------------------------
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
# -- check whether we are running as CMake subdirectory ------------------------
get_directory_property
(
_parent PARENT_DIRECTORY
)
...
...
@@ -268,20 +272,17 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
"./configure to choose a build directory and "
"initialize the build configuration."
)
endif
()
# set module path appropriately
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
# set binary output path if not defined by user
if
(
NOT EXECUTABLE_OUTPUT_PATH
)
set
(
EXECUTABLE_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/bin"
)
endif
()
# set library output path if not defined by user, but always set
# library output path to binary output path for Xcode projects
if
(
CMAKE_GENERATOR STREQUAL
"Xcode"
)
set
(
LIBRARY_OUTPUT_PATH
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
elseif
(
NOT LIBRARY_OUTPUT_PATH
)
set
(
LIBRARY_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib"
)
endif
()
if
(
NOT XCODE
)
# set binary output path if not defined by user
if
(
NOT EXECUTABLE_OUTPUT_PATH
)
set
(
EXECUTABLE_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/bin"
)
endif
()
# set library output path if not defined by user
if
(
NOT LIBRARY_OUTPUT_PATH
)
set
(
LIBRARY_OUTPUT_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib"
)
endif
()
endif
()
################################################################################
# compiler setup #
...
...
cmake/dummy.cpp
0 → 100644
View file @
f983dd0c
// Some CMake generators (in particular XCode) choke on library targets that
// only consist of a TARGET_OBJECTS generator expression. Adding this otherwise
// useless file to the library target makes sure the generated project files
// have at least one regular source file.
namespace
{
[[
maybe_unused
]]
int
dummy
;
}
// namespace
libcaf_core/CMakeLists.txt
View file @
f983dd0c
...
...
@@ -282,7 +282,9 @@ set(CAF_CORE_TEST_SOURCES
add_library
(
libcaf_core_obj OBJECT
${
CAF_CORE_SOURCES
}
${
CAF_CORE_HEADERS
}
)
add_library
(
libcaf_core $<TARGET_OBJECTS:libcaf_core_obj>
)
add_library
(
libcaf_core
"
${
PROJECT_SOURCE_DIR
}
/cmake/dummy.cpp"
$<TARGET_OBJECTS:libcaf_core_obj>
)
add_library
(
caf::core ALIAS libcaf_core
)
...
...
libcaf_io/CMakeLists.txt
View file @
f983dd0c
...
...
@@ -71,7 +71,9 @@ set(CAF_IO_TEST_SOURCES
add_library
(
libcaf_io_obj OBJECT
${
CAF_IO_SOURCES
}
${
CAF_IO_HEADERS
}
)
add_library
(
libcaf_io $<TARGET_OBJECTS:libcaf_io_obj>
)
add_library
(
libcaf_io
"
${
PROJECT_SOURCE_DIR
}
/cmake/dummy.cpp"
$<TARGET_OBJECTS:libcaf_io_obj>
)
add_library
(
caf::io ALIAS libcaf_io
)
...
...
libcaf_openssl/CMakeLists.txt
View file @
f983dd0c
...
...
@@ -21,7 +21,9 @@ set(CAF_OPENSSL_TEST_SOURCES
add_library
(
libcaf_openssl_obj OBJECT
${
CAF_OPENSSL_SOURCES
}
${
CAF_OPENSSL_HEADERS
}
)
add_library
(
libcaf_openssl $<TARGET_OBJECTS:libcaf_openssl_obj>
)
add_library
(
libcaf_openssl
"
${
PROJECT_SOURCE_DIR
}
/cmake/dummy.cpp"
$<TARGET_OBJECTS:libcaf_openssl_obj>
)
add_library
(
caf::openssl ALIAS libcaf_openssl
)
...
...
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