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
adf89af5
Commit
adf89af5
authored
Jul 20, 2014
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly propagate version to subprojects
parent
a3065c30
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
CMakeLists.txt
CMakeLists.txt
+7
-6
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+2
-3
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+2
-3
No files found.
CMakeLists.txt
View file @
adf89af5
...
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8)
...
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8)
project
(
caf C CXX
)
project
(
caf C CXX
)
# extract version from VERSION file
# extract version from VERSION file
file
(
STRINGS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/VERSION"
VERSION LIMIT_COUNT 1
)
file
(
STRINGS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/VERSION"
CAF_
VERSION LIMIT_COUNT 1
)
string
(
REPLACE
"."
" "
version_numbers
${
VERSION
}
)
string
(
REPLACE
"."
" "
version_numbers
${
CAF_
VERSION
}
)
separate_arguments
(
version_numbers
)
separate_arguments
(
version_numbers
)
list
(
GET version_numbers 0
LIB
CAF_VERSION_MAJOR
)
list
(
GET version_numbers 0 CAF_VERSION_MAJOR
)
list
(
GET version_numbers 1
LIB
CAF_VERSION_MINOR
)
list
(
GET version_numbers 1 CAF_VERSION_MINOR
)
list
(
GET version_numbers 2
LIB
CAF_VERSION_PATCH
)
list
(
GET version_numbers 2 CAF_VERSION_PATCH
)
# prohibit in-source builds
# prohibit in-source builds
if
(
"
${
CMAKE_SOURCE_DIR
}
"
STREQUAL
"
${
CMAKE_BINARY_DIR
}
"
)
if
(
"
${
CMAKE_SOURCE_DIR
}
"
STREQUAL
"
${
CMAKE_BINARY_DIR
}
"
)
...
@@ -239,7 +239,7 @@ endif ()
...
@@ -239,7 +239,7 @@ endif ()
message
(
STATUS
message
(
STATUS
"
\n
====================| Build Summary |===================="
"
\n
====================| Build Summary |===================="
"
\n
"
"
\n
"
"
\n
Libcaf version:
${
LIBRARY
_VERSION
}
"
"
\n
Libcaf version:
${
CAF
_VERSION
}
"
"
\n
"
"
\n
"
"
\n
Build type:
${
CMAKE_BUILD_TYPE
}
"
"
\n
Build type:
${
CMAKE_BUILD_TYPE
}
"
"
\n
Runtime checks:
${
DEBUG_MODE_STR
}
"
"
\n
Runtime checks:
${
DEBUG_MODE_STR
}
"
...
@@ -260,5 +260,6 @@ message(STATUS
...
@@ -260,5 +260,6 @@ message(STATUS
"
\n
Executable path:
${
EXECUTABLE_OUTPUT_PATH
}
"
"
\n
Executable path:
${
EXECUTABLE_OUTPUT_PATH
}
"
"
\n
Library path:
${
LIBRARY_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
"
"
\n
"
"
\n
===========================================================
\n
"
)
"
\n
===========================================================
\n
"
)
libcaf_core/CMakeLists.txt
View file @
adf89af5
...
@@ -78,12 +78,11 @@ set (LIBCAF_CORE_SRCS
...
@@ -78,12 +78,11 @@ set (LIBCAF_CORE_SRCS
if
(
NOT
"
${
CAF_BUILD_STATIC_ONLY
}
"
STREQUAL
"yes"
)
if
(
NOT
"
${
CAF_BUILD_STATIC_ONLY
}
"
STREQUAL
"yes"
)
add_library
(
libcaf_core SHARED
${
LIBCAF_CORE_SRCS
}
${
LIBCAF_CORE_HDRS
}
)
add_library
(
libcaf_core SHARED
${
LIBCAF_CORE_SRCS
}
${
LIBCAF_CORE_HDRS
}
)
target_link_libraries
(
libcaf_core
${
LD_FLAGS
}
)
target_link_libraries
(
libcaf_core
${
LD_FLAGS
}
)
set
(
LIBRARY_VERSION
${
LIBCAF_VERSION_MAJOR
}
.
${
LIBCAF_VERSION_MINOR
}
.
${
LIBCAF_VERSION_PATCH
}
)
set
(
LIBRARY_SOVERSION
${
CAF_VERSION_MAJOR
}
)
set
(
LIBRARY_SOVERSION
${
LIBCAF_VERSION_MAJOR
}
)
set_target_properties
(
libcaf_core
set_target_properties
(
libcaf_core
PROPERTIES
PROPERTIES
SOVERSION
${
LIBRARY_SOVERSION
}
SOVERSION
${
LIBRARY_SOVERSION
}
VERSION
${
LIBRARY
_VERSION
}
VERSION
${
CAF
_VERSION
}
OUTPUT_NAME caf_core
)
OUTPUT_NAME caf_core
)
if
(
NOT MINGW
)
if
(
NOT MINGW
)
install
(
TARGETS libcaf_core LIBRARY DESTINATION lib
)
install
(
TARGETS libcaf_core LIBRARY DESTINATION lib
)
...
...
libcaf_io/CMakeLists.txt
View file @
adf89af5
...
@@ -19,12 +19,11 @@ set (LIBCAF_IO_SRCS
...
@@ -19,12 +19,11 @@ set (LIBCAF_IO_SRCS
if
(
NOT
"
${
CAF_BUILD_STATIC_ONLY
}
"
STREQUAL
"yes"
)
if
(
NOT
"
${
CAF_BUILD_STATIC_ONLY
}
"
STREQUAL
"yes"
)
add_library
(
libcaf_io SHARED
${
LIBCAF_IO_SRCS
}
${
LIBCAF_IO_HDRS
}
)
add_library
(
libcaf_io SHARED
${
LIBCAF_IO_SRCS
}
${
LIBCAF_IO_HDRS
}
)
target_link_libraries
(
libcaf_io
${
LD_FLAGS
}
${
LIBCAF_CORE_LIBRARY
}
)
target_link_libraries
(
libcaf_io
${
LD_FLAGS
}
${
LIBCAF_CORE_LIBRARY
}
)
set
(
LIBRARY_VERSION
${
LIBCAF_VERSION_MAJOR
}
.
${
LIBCAF_VERSION_MINOR
}
.
${
LIBCAF_VERSION_PATCH
}
)
set
(
LIBRARY_SOVERSION
${
CAF_VERSION_MAJOR
}
)
set
(
LIBRARY_SOVERSION
${
LIBCAF_VERSION_MAJOR
}
)
set_target_properties
(
libcaf_io
set_target_properties
(
libcaf_io
PROPERTIES
PROPERTIES
SOVERSION
${
LIBRARY_SOVERSION
}
SOVERSION
${
LIBRARY_SOVERSION
}
VERSION
${
LIBRARY
_VERSION
}
VERSION
${
CAF
_VERSION
}
OUTPUT_NAME caf_io
)
OUTPUT_NAME caf_io
)
if
(
NOT MINGW
)
if
(
NOT MINGW
)
install
(
TARGETS libcaf_io LIBRARY DESTINATION lib
)
install
(
TARGETS libcaf_io LIBRARY DESTINATION lib
)
...
...
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