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
c2c3f15a
Commit
c2c3f15a
authored
Sep 16, 2019
by
Derek Ditch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use CMAKE_INSTALL_* vars for install paths
parent
5d6cda55
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
23 deletions
+27
-23
CMakeLists.txt
CMakeLists.txt
+5
-1
cmake/FindCAF.cmake
cmake/FindCAF.cmake
+3
-3
examples/CMakeLists.txt
examples/CMakeLists.txt
+1
-1
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+5
-5
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+4
-4
libcaf_opencl/CMakeLists.txt
libcaf_opencl/CMakeLists.txt
+3
-3
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+4
-4
libcaf_python/CMakeLists.txt
libcaf_python/CMakeLists.txt
+1
-1
tools/CMakeLists.txt
tools/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
c2c3f15a
...
@@ -4,6 +4,10 @@ project(caf C CXX)
...
@@ -4,6 +4,10 @@ project(caf C CXX)
include
(
CheckCSourceCompiles
)
include
(
CheckCSourceCompiles
)
include
(
CheckCSourceRuns
)
include
(
CheckCSourceRuns
)
# Set default install paths.
# See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
include
(
GNUInstallDirs
)
get_directory_property
(
_parent PARENT_DIRECTORY
)
get_directory_property
(
_parent PARENT_DIRECTORY
)
if
(
_parent
)
if
(
_parent
)
set
(
caf_is_subproject ON
)
set
(
caf_is_subproject ON
)
...
@@ -407,7 +411,7 @@ endif()
...
@@ -407,7 +411,7 @@ endif()
################################################################################
################################################################################
# install includes from test
# install includes from test
install
(
DIRECTORY libcaf_test/caf/ DESTINATION
include
/caf
install
(
DIRECTORY libcaf_test/caf/ DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/caf
FILES_MATCHING PATTERN
"*.hpp"
)
FILES_MATCHING PATTERN
"*.hpp"
)
# process cmake_uninstall.cmake.in
# process cmake_uninstall.cmake.in
...
...
cmake/FindCAF.cmake
View file @
c2c3f15a
...
@@ -66,7 +66,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
...
@@ -66,7 +66,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
/usr/local/include
/usr/local/include
/opt/local/include
/opt/local/include
/sw/include
/sw/include
${
CMAKE_INSTALL_PREFIX
}
/
include
)
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_INCLUDEDIR
}
)
if
(
"
${
caf_build_header_path
}
"
STREQUAL
"caf_build_header_path-NOTFOUND"
)
if
(
"
${
caf_build_header_path
}
"
STREQUAL
"caf_build_header_path-NOTFOUND"
)
message
(
WARNING
"Found all.hpp for CAF core, but not build_config.hpp"
)
message
(
WARNING
"Found all.hpp for CAF core, but not build_config.hpp"
)
set
(
CAF_
${
comp
}
_FOUND false
)
set
(
CAF_
${
comp
}
_FOUND false
)
...
@@ -91,8 +91,8 @@ foreach (comp ${CAF_FIND_COMPONENTS})
...
@@ -91,8 +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
}
/
${
CMAKE_INSTALL_LIBDIR
}
${
CMAKE_INSTALL_PREFIX
}
/
lib
/
${
CMAKE_BUILD_TYPE
}
)
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
/
${
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"
)
...
...
examples/CMakeLists.txt
View file @
c2c3f15a
...
@@ -10,7 +10,7 @@ macro(add folder name)
...
@@ -10,7 +10,7 @@ macro(add folder name)
${
CAF_EXTRA_LDFLAGS
}
${
CAF_EXTRA_LDFLAGS
}
${
CAF_LIBRARIES
}
${
CAF_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
)
${
PTHREAD_LIBRARIES
}
)
install
(
FILES
${
folder
}
/
${
name
}
.cpp DESTINATION
share
/caf/examples/
${
folder
}
)
install
(
FILES
${
folder
}
/
${
name
}
.cpp DESTINATION
${
CMAKE_INSTALL_DATADIR
}
/caf/examples/
${
folder
}
)
add_dependencies
(
${
name
}
all_examples
)
add_dependencies
(
${
name
}
all_examples
)
endmacro
()
endmacro
()
...
...
libcaf_core/CMakeLists.txt
View file @
c2c3f15a
...
@@ -143,7 +143,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/build_config.hpp.in"
...
@@ -143,7 +143,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/build_config.hpp.in"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
@ONLY
)
@ONLY
)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
DESTINATION
include
/caf/detail
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/caf/detail
)
)
list
(
APPEND LIBCAF_CORE_HDRS
list
(
APPEND LIBCAF_CORE_HDRS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/caf/detail/build_config.hpp"
...
@@ -167,8 +167,8 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -167,8 +167,8 @@ if (NOT CAF_BUILD_STATIC_ONLY)
OUTPUT_NAME caf_core
OUTPUT_NAME caf_core
)
)
install
(
TARGETS libcaf_core_shared
install
(
TARGETS libcaf_core_shared
RUNTIME DESTINATION
bin
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
lib
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
)
add_dependencies
(
libcaf_core_shared libcaf_core
)
add_dependencies
(
libcaf_core_shared libcaf_core
)
endif
()
endif
()
...
@@ -183,11 +183,11 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
...
@@ -183,11 +183,11 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include>
)
)
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
${
CMAKE_INSTALL_LIBDIR
}
)
add_dependencies
(
libcaf_core_static libcaf_core
)
add_dependencies
(
libcaf_core_static libcaf_core
)
endif
()
endif
()
install
(
DIRECTORY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf"
install
(
DIRECTORY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf"
DESTINATION
include
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
FILES_MATCHING PATTERN
"*.hpp"
FILES_MATCHING PATTERN
"*.hpp"
)
)
libcaf_io/CMakeLists.txt
View file @
c2c3f15a
...
@@ -65,8 +65,8 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -65,8 +65,8 @@ if (NOT CAF_BUILD_STATIC_ONLY)
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
OUTPUT_NAME caf_io
)
OUTPUT_NAME caf_io
)
install
(
TARGETS libcaf_io_shared
install
(
TARGETS libcaf_io_shared
RUNTIME DESTINATION
bin
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
lib
)
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
add_dependencies
(
libcaf_io_shared libcaf_io
)
add_dependencies
(
libcaf_io_shared libcaf_io
)
endif
()
endif
()
...
@@ -79,11 +79,11 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
...
@@ -79,11 +79,11 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include>
)
)
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
${
CMAKE_INSTALL_LIBDIR
}
)
add_dependencies
(
libcaf_io_static libcaf_io
)
add_dependencies
(
libcaf_io_static libcaf_io
)
endif
()
endif
()
# install includes
# install includes
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf
DESTINATION
include
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
FILES_MATCHING PATTERN
"*.hpp"
)
FILES_MATCHING PATTERN
"*.hpp"
)
libcaf_opencl/CMakeLists.txt
View file @
c2c3f15a
...
@@ -30,7 +30,7 @@ if(NOT CAF_BUILD_STATIC_ONLY)
...
@@ -30,7 +30,7 @@ if(NOT CAF_BUILD_STATIC_ONLY)
SOVERSION
"
${
CAF_VERSION
}
"
SOVERSION
"
${
CAF_VERSION
}
"
VERSION
"
${
CAF_VERSION
}
"
VERSION
"
${
CAF_VERSION
}
"
OUTPUT_NAME caf_opencl
)
OUTPUT_NAME caf_opencl
)
install
(
TARGETS libcaf_opencl_shared LIBRARY DESTINATION
lib
)
install
(
TARGETS libcaf_opencl_shared LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
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
...
@@ -46,10 +46,10 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
...
@@ -46,10 +46,10 @@ if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include>
)
)
set_target_properties
(
libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static
)
set_target_properties
(
libcaf_opencl_static PROPERTIES OUTPUT_NAME caf_opencl_static
)
install
(
TARGETS libcaf_opencl_static ARCHIVE DESTINATION
lib
)
install
(
TARGETS libcaf_opencl_static ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
endif
()
# install includes
# install includes
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/caf
DESTINATION
include
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
FILES_MATCHING PATTERN
"*.hpp"
)
FILES_MATCHING PATTERN
"*.hpp"
)
libcaf_openssl/CMakeLists.txt
View file @
c2c3f15a
...
@@ -35,9 +35,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -35,9 +35,9 @@ if (NOT CAF_BUILD_STATIC_ONLY)
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
OUTPUT_NAME caf_openssl
)
OUTPUT_NAME caf_openssl
)
if
(
CYGWIN
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_openssl_shared RUNTIME DESTINATION
bin
)
install
(
TARGETS libcaf_openssl_shared RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
elseif
(
NOT WIN32
)
elseif
(
NOT WIN32
)
install
(
TARGETS libcaf_openssl_shared LIBRARY DESTINATION
lib
)
install
(
TARGETS libcaf_openssl_shared LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
endif
()
add_dependencies
(
libcaf_openssl_shared libcaf_openssl
)
add_dependencies
(
libcaf_openssl_shared libcaf_openssl
)
endif
()
endif
()
...
@@ -51,7 +51,7 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
...
@@ -51,7 +51,7 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
set_target_properties
(
libcaf_openssl_static PROPERTIES
set_target_properties
(
libcaf_openssl_static PROPERTIES
OUTPUT_NAME caf_openssl_static
)
OUTPUT_NAME caf_openssl_static
)
if
(
NOT WIN32
)
if
(
NOT WIN32
)
install
(
TARGETS libcaf_openssl_static ARCHIVE DESTINATION
lib
)
install
(
TARGETS libcaf_openssl_static ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
endif
()
add_dependencies
(
libcaf_openssl_static libcaf_openssl
)
add_dependencies
(
libcaf_openssl_static libcaf_openssl
)
endif
()
endif
()
...
@@ -61,6 +61,6 @@ include_directories(. ${INCLUDE_DIRS})
...
@@ -61,6 +61,6 @@ include_directories(. ${INCLUDE_DIRS})
# install includes
# install includes
if
(
NOT WIN32
)
if
(
NOT WIN32
)
install
(
DIRECTORY caf/ DESTINATION
include
/caf FILES_MATCHING PATTERN
"*.hpp"
)
install
(
DIRECTORY caf/ DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/caf FILES_MATCHING PATTERN
"*.hpp"
)
endif
()
endif
()
libcaf_python/CMakeLists.txt
View file @
c2c3f15a
...
@@ -53,7 +53,7 @@ if(NOT CAF_NO_PYTHON)
...
@@ -53,7 +53,7 @@ if(NOT CAF_NO_PYTHON)
${
PTHREAD_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
${
LIBEDIT_LIBRARIES
}
${
LIBEDIT_LIBRARIES
}
${
PYTHON_LIBRARIES
}
)
${
PYTHON_LIBRARIES
}
)
install
(
TARGETS caf-python DESTINATION
bin
)
install
(
TARGETS caf-python DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
else
()
else
()
add_custom_target
(
caf-python SOURCES
${
CAF_PYTHON_SRCS
}
${
CAF_PYTHON_HDRS
}
)
add_custom_target
(
caf-python SOURCES
${
CAF_PYTHON_SRCS
}
${
CAF_PYTHON_HDRS
}
)
endif
()
endif
()
...
...
tools/CMakeLists.txt
View file @
c2c3f15a
...
@@ -10,7 +10,7 @@ macro(add name)
...
@@ -10,7 +10,7 @@ macro(add name)
${
CAF_EXTRA_LDFLAGS
}
${
CAF_EXTRA_LDFLAGS
}
${
CAF_LIBRARIES
}
${
CAF_LIBRARIES
}
${
PTHREAD_LIBRARIES
}
)
${
PTHREAD_LIBRARIES
}
)
install
(
FILES
${
name
}
.cpp DESTINATION
share
/caf/tools/
${
folder
}
)
install
(
FILES
${
name
}
.cpp DESTINATION
${
CMAKE_INSTALL_DATADIR
}
/caf/tools/
${
folder
}
)
add_dependencies
(
${
name
}
all_tools
)
add_dependencies
(
${
name
}
all_tools
)
endmacro
()
endmacro
()
...
...
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