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
b0f26966
Commit
b0f26966
authored
Jul 06, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update LDFLAGS and LD_FLAGS to new name
parent
8f0085f2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+2
-2
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+2
-2
libcaf_opencl/CMakeLists.txt
libcaf_opencl/CMakeLists.txt
+2
-2
libcaf_opencl/examples/CMakeLists.txt
libcaf_opencl/examples/CMakeLists.txt
+1
-1
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+2
-2
libcaf_python/CMakeLists.txt
libcaf_python/CMakeLists.txt
+4
-4
No files found.
libcaf_core/CMakeLists.txt
View file @
b0f26966
...
@@ -134,7 +134,7 @@ add_custom_target(libcaf_core)
...
@@ -134,7 +134,7 @@ add_custom_target(libcaf_core)
# build shared library if not compiling static only
# build shared library if not compiling static only
if
(
NOT CAF_BUILD_STATIC_ONLY
)
if
(
NOT CAF_BUILD_STATIC_ONLY
)
add_library
(
libcaf_core_shared SHARED
${
LIBCAF_CORE_SRCS
}
${
LIBCAF_CORE_HDRS
}
)
add_library
(
libcaf_core_shared SHARED
${
LIBCAF_CORE_SRCS
}
${
LIBCAF_CORE_HDRS
}
)
target_link_libraries
(
libcaf_core_shared
${
LD_
FLAGS
}
)
target_link_libraries
(
libcaf_core_shared
${
CAF_EXTRA_LD
FLAGS
}
)
set_target_properties
(
libcaf_core_shared
set_target_properties
(
libcaf_core_shared
PROPERTIES
PROPERTIES
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
...
@@ -151,7 +151,7 @@ endif ()
...
@@ -151,7 +151,7 @@ endif ()
# build static library only if --build-static or --build-static-only was set
# build static library only if --build-static or --build-static-only was set
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_library
(
libcaf_core_static STATIC
${
LIBCAF_CORE_HDRS
}
${
LIBCAF_CORE_SRCS
}
)
add_library
(
libcaf_core_static STATIC
${
LIBCAF_CORE_HDRS
}
${
LIBCAF_CORE_SRCS
}
)
target_link_libraries
(
libcaf_core_static
${
LD_
FLAGS
}
)
target_link_libraries
(
libcaf_core_static
${
CAF_EXTRA_LD
FLAGS
}
)
set_target_properties
(
libcaf_core_static PROPERTIES OUTPUT_NAME caf_core_static
)
set_target_properties
(
libcaf_core_static PROPERTIES OUTPUT_NAME caf_core_static
)
install
(
TARGETS libcaf_core_static ARCHIVE DESTINATION lib
)
install
(
TARGETS libcaf_core_static ARCHIVE DESTINATION lib
)
add_dependencies
(
libcaf_core_static libcaf_core
)
add_dependencies
(
libcaf_core_static libcaf_core
)
...
...
libcaf_io/CMakeLists.txt
View file @
b0f26966
...
@@ -42,7 +42,7 @@ add_custom_target(libcaf_io)
...
@@ -42,7 +42,7 @@ add_custom_target(libcaf_io)
# build shared library if not compiling static only
# build shared library if not compiling static only
if
(
NOT CAF_BUILD_STATIC_ONLY
)
if
(
NOT CAF_BUILD_STATIC_ONLY
)
add_library
(
libcaf_io_shared SHARED
${
LIBCAF_IO_SRCS
}
${
LIBCAF_IO_HDRS
}
)
add_library
(
libcaf_io_shared SHARED
${
LIBCAF_IO_SRCS
}
${
LIBCAF_IO_HDRS
}
)
target_link_libraries
(
libcaf_io_shared
${
LDFLAGS
}
${
CAF_LIBRARY_CORE
}
)
target_link_libraries
(
libcaf_io_shared
${
CAF_EXTRA_
LDFLAGS
}
${
CAF_LIBRARY_CORE
}
)
set_target_properties
(
libcaf_io_shared
set_target_properties
(
libcaf_io_shared
PROPERTIES
PROPERTIES
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
...
@@ -59,7 +59,7 @@ endif ()
...
@@ -59,7 +59,7 @@ endif ()
# build static library only if --build-static or --build-static-only was set
# build static library only if --build-static or --build-static-only was set
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_library
(
libcaf_io_static STATIC
${
LIBCAF_IO_HDRS
}
${
LIBCAF_IO_SRCS
}
)
add_library
(
libcaf_io_static STATIC
${
LIBCAF_IO_HDRS
}
${
LIBCAF_IO_SRCS
}
)
target_link_libraries
(
libcaf_io_static
${
LDFLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
)
target_link_libraries
(
libcaf_io_static
${
CAF_EXTRA_
LDFLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
)
set_target_properties
(
libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static
)
set_target_properties
(
libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static
)
install
(
TARGETS libcaf_io_static ARCHIVE DESTINATION lib
)
install
(
TARGETS libcaf_io_static ARCHIVE DESTINATION lib
)
add_dependencies
(
libcaf_io_static libcaf_io
)
add_dependencies
(
libcaf_io_static libcaf_io
)
...
...
libcaf_opencl/CMakeLists.txt
View file @
b0f26966
...
@@ -21,7 +21,7 @@ set(LIBCAF_OPENCL_SRCS
...
@@ -21,7 +21,7 @@ set(LIBCAF_OPENCL_SRCS
if
(
NOT CAF_BUILD_STATIC_ONLY
)
if
(
NOT CAF_BUILD_STATIC_ONLY
)
add_library
(
libcaf_opencl_shared SHARED
${
LIBCAF_OPENCL_SRCS
}
add_library
(
libcaf_opencl_shared SHARED
${
LIBCAF_OPENCL_SRCS
}
${
LIBCAF_OPENCL_HDRS
}
${
OpenCL_INCLUDE_DIRS
}
)
${
LIBCAF_OPENCL_HDRS
}
${
OpenCL_INCLUDE_DIRS
}
)
target_link_libraries
(
libcaf_opencl_shared
${
LD_
FLAGS
}
target_link_libraries
(
libcaf_opencl_shared
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARY_CORE
}
${
CAF_LIBRARY_CORE
}
${
OpenCL_LIBRARIES
}
)
${
OpenCL_LIBRARIES
}
)
set_target_properties
(
libcaf_opencl_shared
set_target_properties
(
libcaf_opencl_shared
...
@@ -39,7 +39,7 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
...
@@ -39,7 +39,7 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library
(
libcaf_opencl_static STATIC
${
LIBCAF_OPENCL_SRCS
}
add_library
(
libcaf_opencl_static STATIC
${
LIBCAF_OPENCL_SRCS
}
${
LIBCAF_OPENCL_HDRS
}
${
LIBCAF_OPENCL_HDRS
}
${
OpenCL_INCLUDE_DIRS
}
)
${
OpenCL_INCLUDE_DIRS
}
)
target_link_libraries
(
libcaf_opencl_static
${
LD_
FLAGS
}
target_link_libraries
(
libcaf_opencl_static
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
${
CAF_LIBRARY_CORE_STATIC
}
${
OpenCL_LIBRARIES
}
)
${
OpenCL_LIBRARIES
}
)
set_target_properties
(
libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static
)
set_target_properties
(
libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static
)
...
...
libcaf_opencl/examples/CMakeLists.txt
View file @
b0f26966
...
@@ -12,7 +12,7 @@ if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES)
...
@@ -12,7 +12,7 @@ if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES)
macro
(
add name folder
)
macro
(
add name folder
)
add_executable
(
${
name
}
${
folder
}
/
${
name
}
.cpp
${
ARGN
}
)
add_executable
(
${
name
}
${
folder
}
/
${
name
}
.cpp
${
ARGN
}
)
target_link_libraries
(
${
name
}
target_link_libraries
(
${
name
}
${
LD_
FLAGS
}
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARIES
}
${
CAF_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
${
WSLIB
}
${
WSLIB
}
...
...
libcaf_openssl/CMakeLists.txt
View file @
b0f26966
...
@@ -23,7 +23,7 @@ endif()
...
@@ -23,7 +23,7 @@ endif()
if
(
NOT CAF_BUILD_STATIC_ONLY
)
if
(
NOT CAF_BUILD_STATIC_ONLY
)
add_library
(
libcaf_openssl_shared SHARED
add_library
(
libcaf_openssl_shared SHARED
${
LIBCAF_OPENSSL_SRCS
}
${
LIBCAF_OPENSSL_HDRS
}
)
${
LIBCAF_OPENSSL_SRCS
}
${
LIBCAF_OPENSSL_HDRS
}
)
target_link_libraries
(
libcaf_openssl_shared
${
LD_
FLAGS
}
target_link_libraries
(
libcaf_openssl_shared
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARY_CORE
}
${
CAF_LIBRARY_IO
}
${
OPENSSL_LIBRARIES
}
)
${
CAF_LIBRARY_CORE
}
${
CAF_LIBRARY_IO
}
${
OPENSSL_LIBRARIES
}
)
if
(
NOT APPLE AND NOT WIN32
)
if
(
NOT APPLE AND NOT WIN32
)
...
@@ -47,7 +47,7 @@ endif ()
...
@@ -47,7 +47,7 @@ endif ()
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_library
(
libcaf_openssl_static STATIC
add_library
(
libcaf_openssl_static STATIC
${
LIBCAF_OPENSSL_HDRS
}
${
LIBCAF_OPENSSL_SRCS
}
)
${
LIBCAF_OPENSSL_HDRS
}
${
LIBCAF_OPENSSL_SRCS
}
)
target_link_libraries
(
libcaf_openssl_static
${
LD_
FLAGS
}
target_link_libraries
(
libcaf_openssl_static
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
${
CAF_LIBRARY_IO_STATIC
}
${
OPENSSL_LIBRARIES
}
)
${
CAF_LIBRARY_CORE_STATIC
}
${
CAF_LIBRARY_IO_STATIC
}
${
OPENSSL_LIBRARIES
}
)
set_target_properties
(
libcaf_openssl_static PROPERTIES
set_target_properties
(
libcaf_openssl_static PROPERTIES
OUTPUT_NAME caf_openssl_static
)
OUTPUT_NAME caf_openssl_static
)
...
...
libcaf_python/CMakeLists.txt
View file @
b0f26966
...
@@ -13,10 +13,10 @@ else()
...
@@ -13,10 +13,10 @@ else()
execute_process
(
COMMAND
"
${
CAF_PYTHON_CONFIG_BIN
}
"
--ldflags
execute_process
(
COMMAND
"
${
CAF_PYTHON_CONFIG_BIN
}
"
--ldflags
OUTPUT_VARIABLE PYTHON_LDFLAGS
)
OUTPUT_VARIABLE PYTHON_LDFLAGS
)
string
(
STRIP
"
${
PYTHON_LDFLAGS
}
"
PYTHON_LDFLAGS
)
string
(
STRIP
"
${
PYTHON_LDFLAGS
}
"
PYTHON_LDFLAGS
)
if
(
"
${
LD_
FLAGS
}
"
STREQUAL
""
)
if
(
"
${
CAF_EXTRA_LD
FLAGS
}
"
STREQUAL
""
)
set
(
LD_
FLAGS
"
${
PYTHON_LDFLAGS
}
"
)
set
(
CAF_EXTRA_LD
FLAGS
"
${
PYTHON_LDFLAGS
}
"
)
else
()
else
()
set
(
LD_FLAGS
"
${
LD_
FLAGS
}
${
PYTHON_LDFLAGS
}
"
)
set
(
CAF_EXTRA_LDFLAGS
"
${
CAF_EXTRA_LD
FLAGS
}
${
PYTHON_LDFLAGS
}
"
)
endif
()
endif
()
string
(
REPLACE
" -I"
";-I"
dir_list
${
PYTHON_INCLUDE_FLAGS
}
)
string
(
REPLACE
" -I"
";-I"
dir_list
${
PYTHON_INCLUDE_FLAGS
}
)
foreach
(
flag
${
dir_list
}
)
foreach
(
flag
${
dir_list
}
)
...
@@ -46,7 +46,7 @@ if(NOT CAF_NO_PYTHON)
...
@@ -46,7 +46,7 @@ if(NOT CAF_NO_PYTHON)
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
add_executable
(
caf-python
${
CAF_PYTHON_SRCS
}
${
CAF_PYTHON_HDRS
}
)
add_executable
(
caf-python
${
CAF_PYTHON_SRCS
}
${
CAF_PYTHON_HDRS
}
)
target_link_libraries
(
caf-python
target_link_libraries
(
caf-python
${
LD_
FLAGS
}
${
CAF_EXTRA_LD
FLAGS
}
${
CAF_LIBRARY_CORE
}
${
CAF_LIBRARY_CORE
}
${
CAF_LIBRARY_IO
}
${
CAF_LIBRARY_IO
}
${
CAF_LIBRARY_RIAC
}
${
CAF_LIBRARY_RIAC
}
...
...
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