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
19119aac
Unverified
Commit
19119aac
authored
Dec 20, 2019
by
Kai Lothar John
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes Xcode build issues
parent
2381afd4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
58 additions
and
15 deletions
+58
-15
CMakeLists.txt
CMakeLists.txt
+14
-15
cmake/XcodeSpecifics.cmake
cmake/XcodeSpecifics.cmake
+38
-0
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+2
-0
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+2
-0
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+2
-0
No files found.
CMakeLists.txt
View file @
19119aac
...
@@ -13,6 +13,10 @@ include(CheckCSourceRuns) # Check whether compiler produces binaries
...
@@ -13,6 +13,10 @@ include(CheckCSourceRuns) # Check whether compiler produces binaries
include
(
GNUInstallDirs
)
# Sets default install paths
include
(
GNUInstallDirs
)
# Sets default install paths
include
(
GenerateExportHeader
)
# Auto-generates dllexport macros
include
(
GenerateExportHeader
)
# Auto-generates dllexport macros
# -- project-specific includes ------------------------------------------------------------------
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
include
(
XcodeSpecifics
)
# -- check whether we are running as CMake subdirectory ------------------------
# -- check whether we are running as CMake subdirectory ------------------------
get_directory_property
(
_parent PARENT_DIRECTORY
)
get_directory_property
(
_parent PARENT_DIRECTORY
)
...
@@ -268,20 +272,17 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
...
@@ -268,20 +272,17 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
"./configure to choose a build directory and "
"./configure to choose a build directory and "
"initialize the build configuration."
)
"initialize the build configuration."
)
endif
()
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 #
# compiler setup #
...
@@ -666,8 +667,6 @@ if(NOT CAF_NO_SUMMARY)
...
@@ -666,8 +667,6 @@ if(NOT CAF_NO_SUMMARY)
"
\n
"
"
\n
"
"
\n
Source directory:
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"
\n
Source directory:
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"
\n
Build directory:
${
CMAKE_CURRENT_BINARY_DIR
}
"
"
\n
Build directory:
${
CMAKE_CURRENT_BINARY_DIR
}
"
"
\n
Executable path:
${
EXECUTABLE_OUTPUT_PATH
}
"
"
\n
Library path:
${
LIBRARY_OUTPUT_PATH
}
"
"
\n
Install prefix:
${
CMAKE_INSTALL_PREFIX
}
"
"
\n
Install prefix:
${
CMAKE_INSTALL_PREFIX
}
"
"
\n
Generator:
${
CMAKE_GENERATOR
}
"
"
\n
Generator:
${
CMAKE_GENERATOR
}
"
"
\n
"
"
\n
"
...
...
cmake/XcodeSpecifics.cmake
0 → 100644
View file @
19119aac
# -*- mode: cmake; coding: utf-8; indent-tabs-mode: nil; -*-
#
# Specifics of the Xcode generator
#
#########################################################################
#
# FUNCTION: xcode_assert_target_not_empty(target)
#
# If `target` was defined in conjunction with an object library
# (`TARGET_OBJECTS`), then the Xcode build system may delete the
# generated `target` artefact during the build. This occurs, when
# there are no regular sources in the `target`.
#
# Calling this function will generate a dummy source file, to make
# sure that the SOURCES property of `target` contains at least one
# regular source file.
#
# Applies only under the Xcode generator. For all other generators,
# the function does nothing.
#
# If `target` is not a valid target, does nothing.
#
function
(
xcode_assert_target_not_empty target
)
if
(
XCODE
)
if
(
TARGET
${
target
}
)
set
(
dummy_content
"namespace { [[maybe_unused]] auto dummy = 0; }
\n
"
)
set
(
dummy_location
"
${
CMAKE_CURRENT_BINARY_DIR
}
/src/
${
target
}
_dummy.cpp"
)
file
(
GENERATE OUTPUT
"
${
dummy_location
}
"
CONTENT
"
${
dummy_content
}
"
)
if
(
CMAKE_VERSION VERSION_GREATER_EQUAL 3.1
)
target_sources
(
${
target
}
PRIVATE
"
${
dummy_location
}
"
)
else
()
set_property
(
TARGET
${
target
}
APPEND PROPERTY SOURCES
"
${
dummy_location
}
"
)
endif
()
else
(
TARGET
${
target
}
)
message
(
WARNING
"xcode_assert_target_not_empty(): Not a target:
${
target
}
"
)
endif
(
TARGET
${
target
}
)
endif
(
XCODE
)
endfunction
(
xcode_assert_target_not_empty
)
libcaf_core/CMakeLists.txt
View file @
19119aac
...
@@ -284,6 +284,8 @@ add_library(libcaf_core_obj OBJECT ${CAF_CORE_SOURCES} ${CAF_CORE_HEADERS})
...
@@ -284,6 +284,8 @@ 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 $<TARGET_OBJECTS:libcaf_core_obj>
)
xcode_assert_target_not_empty
(
libcaf_core
)
add_library
(
caf::core ALIAS libcaf_core
)
add_library
(
caf::core ALIAS libcaf_core
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
...
...
libcaf_io/CMakeLists.txt
View file @
19119aac
...
@@ -73,6 +73,8 @@ add_library(libcaf_io_obj OBJECT ${CAF_IO_SOURCES} ${CAF_IO_HEADERS})
...
@@ -73,6 +73,8 @@ 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 $<TARGET_OBJECTS:libcaf_io_obj>
)
xcode_assert_target_not_empty
(
libcaf_io
)
add_library
(
caf::io ALIAS libcaf_io
)
add_library
(
caf::io ALIAS libcaf_io
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
...
...
libcaf_openssl/CMakeLists.txt
View file @
19119aac
...
@@ -23,6 +23,8 @@ add_library(libcaf_openssl_obj OBJECT ${CAF_OPENSSL_SOURCES} ${CAF_OPENSSL_HEADE
...
@@ -23,6 +23,8 @@ add_library(libcaf_openssl_obj OBJECT ${CAF_OPENSSL_SOURCES} ${CAF_OPENSSL_HEADE
add_library
(
libcaf_openssl $<TARGET_OBJECTS:libcaf_openssl_obj>
)
add_library
(
libcaf_openssl $<TARGET_OBJECTS:libcaf_openssl_obj>
)
xcode_assert_target_not_empty
(
libcaf_openssl
)
add_library
(
caf::openssl ALIAS libcaf_openssl
)
add_library
(
caf::openssl ALIAS libcaf_openssl
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
if
(
BUILD_SHARED_LIBS AND NOT WIN32
)
...
...
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