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
8490a3b6
Commit
8490a3b6
authored
Jul 04, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LDFLAG handling with whitespaces
parent
dbebe716
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
CMakeLists.txt
CMakeLists.txt
+6
-10
No files found.
CMakeLists.txt
View file @
8490a3b6
...
...
@@ -128,12 +128,6 @@ else()
set
(
CAF_NO_PYTHON yes
)
endif
()
################################################################################
# respect environment variables #
################################################################################
set
(
LDFLAGS $ENV{LDFLAGS}
)
################################################################################
# get version of CAF #
################################################################################
...
...
@@ -317,7 +311,7 @@ if(MINGW)
add_definitions
(
-D_WIN32_WINNT=0x0600
)
add_definitions
(
-DWIN32
)
include
(
GenerateExportHeader
)
list
(
APPEND LDFLAGS -lws2_32 -liphlpapi -lpsapi
)
list
(
APPEND
CAF_EXTRA_
LDFLAGS -lws2_32 -liphlpapi -lpsapi
)
# build static to avoid runtime dependencies to GCC libraries
build_string
(
"EXTRA_FLAGS"
"-static"
)
elseif
(
CYGWIN
)
...
...
@@ -326,7 +320,7 @@ else()
build_string
(
"EXTRA_FLAGS"
"-fPIC"
)
endif
()
if
(
WIN32
)
list
(
APPEND LDFLAGS ws2_32 iphlpapi
)
list
(
APPEND
CAF_EXTRA_
LDFLAGS ws2_32 iphlpapi
)
endif
()
# iOS support
if
(
CAF_OSX_SYSROOT
)
...
...
@@ -601,7 +595,7 @@ if(NOT CAF_NO_UNIT_TESTS)
libcaf_test/caf/test/unit_test_impl.hpp
${
CAF_ALL_UNIT_TESTS
}
)
target_link_libraries
(
caf-test
${
LDFLAGS
}
${
CAF_EXTRA_
LDFLAGS
}
${
CAF_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
)
add_custom_target
(
all_unit_tests
)
...
...
@@ -753,6 +747,8 @@ invertYesNo(CAF_NO_PYTHON CAF_BUILD_PYTHON)
# collect all compiler flags
string
(
TOUPPER
"
${
CMAKE_BUILD_TYPE
}
"
UPPER_BUILD_TYPE
)
set
(
ALL_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_
${
UPPER_BUILD_TYPE
}}
"
)
set
(
ALL_LD_FLAGS
"
${
CMAKE_SHARED_LINKER_FLAGS
}
${
CAF_EXTRA_LDFLAGS
}
"
)
string
(
STRIP
"
${
ALL_LD_FLAGS
}
"
ALL_LD_FLAGS
)
# done
if
(
NOT CAF_NO_SUMMARY
)
message
(
STATUS
...
...
@@ -780,7 +776,7 @@ if(NOT CAF_NO_SUMMARY)
"
\n
"
"
\n
CXX:
${
CMAKE_CXX_COMPILER
}
"
"
\n
CXXFLAGS:
${
ALL_CXX_FLAGS
}
"
"
\n
L
DFLAGS:
${
LD
FLAGS
}
"
"
\n
L
INKER_FLAGS (shared)
${
ALL_LD_
FLAGS
}
"
"
\n
"
"
\n
Source directory:
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"
\n
Build directory:
${
CMAKE_CURRENT_BINARY_DIR
}
"
...
...
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