Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
belr
Commits
8e192159
Commit
8e192159
authored
Jun 24, 2016
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake fixes for static library build.
parent
15996291
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
CMakeLists.txt
CMakeLists.txt
+5
-5
cmake/BelrConfig.cmake.in
cmake/BelrConfig.cmake.in
+7
-1
tools/CMakeLists.txt
tools/CMakeLists.txt
+7
-1
No files found.
CMakeLists.txt
View file @
8e192159
...
@@ -129,9 +129,9 @@ include(CMakePackageConfigHelpers)
...
@@ -129,9 +129,9 @@ include(CMakePackageConfigHelpers)
export
(
EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
export
(
EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/BelrTargets.cmake"
FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/BelrTargets.cmake"
)
)
configure_file
(
cmake/BelrConfig.cmake
configure_file
(
cmake/BelrConfig.cmake
.in
"
${
CMAKE_CURRENT_BINARY_DIR
}
/BelrConfig.cmake"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/BelrConfig.cmake"
COPY
ONLY
@
ONLY
)
)
set
(
ConfigPackageLocation share/Belr/cmake
)
set
(
ConfigPackageLocation share/Belr/cmake
)
install
(
EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
install
(
EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
...
...
cmake/BelrConfig.cmake
→
cmake/BelrConfig.cmake
.in
View file @
8e192159
...
@@ -37,5 +37,11 @@ if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
...
@@ -37,5 +37,11 @@ if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
else()
else()
set(BELR_INCLUDE_DIRS "${BELR_CMAKE_DIR}/../../../include")
set(BELR_INCLUDE_DIRS "${BELR_CMAKE_DIR}/../../../include")
endif()
endif()
set
(
BELR_LIBRARIES belr
)
if(@ENABLE_SHARED@)
set(BELR_LIBRARIES belr)
else()
set(BELR_LIBRARIES belr-static)
endif()
set(BELR_FOUND 1)
set(BELR_FOUND 1)
tools/CMakeLists.txt
View file @
8e192159
...
@@ -20,12 +20,18 @@
...
@@ -20,12 +20,18 @@
#
#
############################################################################
############################################################################
if
(
ENABLE_SHARED
)
set
(
BELR_LIBRARIES_FOR_TOOLS belr
)
else
()
set
(
BELR_LIBRARIES_FOR_TOOLS belr-static
)
endif
()
foreach
(
EXECTUABLE belr-parse belr-demo
)
foreach
(
EXECTUABLE belr-parse belr-demo
)
set
(
SOURCE_FILES_CXX
${
EXECTUABLE
}
.cc
)
set
(
SOURCE_FILES_CXX
${
EXECTUABLE
}
.cc
)
apply_compile_flags
(
SOURCE_FILES_CXX
"CPP"
"CXX"
)
apply_compile_flags
(
SOURCE_FILES_CXX
"CPP"
"CXX"
)
add_executable
(
${
EXECTUABLE
}
${
SOURCE_FILES_CXX
}
)
add_executable
(
${
EXECTUABLE
}
${
SOURCE_FILES_CXX
}
)
set_target_properties
(
${
EXECTUABLE
}
PROPERTIES LINKER_LANGUAGE CXX
)
set_target_properties
(
${
EXECTUABLE
}
PROPERTIES LINKER_LANGUAGE CXX
)
target_link_libraries
(
${
EXECTUABLE
}
belr
)
target_link_libraries
(
${
EXECTUABLE
}
${
BELR_LIBRARIES_FOR_TOOLS
}
)
if
(
APPLE
)
if
(
APPLE
)
set_target_properties
(
${
EXECTUABLE
}
PROPERTIES LINK_FLAGS
"-stdlib=libc++"
)
set_target_properties
(
${
EXECTUABLE
}
PROPERTIES LINK_FLAGS
"-stdlib=libc++"
)
endif
()
endif
()
...
...
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