Skip to content
Snippets Groups Projects
Commit aa1d8707 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

cmake: "libjami-daemon" -> "libjami" (used in other build systems)

Change-Id: I9ef704107897a0a057e7d43feeb24d5e2eb73679
parent d5ef59e4
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 3.16)
project(jami-daemon
project(jami
VERSION 13.7.0
LANGUAGES C CXX)
set(PACKAGE_NAME "Jami Daemon")
......@@ -241,6 +241,13 @@ elseif(MSVC)
endif()
add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
# Add the lib prefix to the output name for MSVC.
if (MSVC)
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
endif()
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "daemon")
set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
target_compile_definitions(${PROJECT_NAME} PRIVATE
......
......@@ -16,5 +16,5 @@
"libgit2"
],
"configuration": "ReleaseLib_win32",
"project_paths": ["jami-daemon.vcxproj"]
"use_cmake": true
}
......@@ -49,7 +49,6 @@ log = None
# project paths
daemon_msvc_dir = os.path.dirname(os.path.realpath(__file__))
daemon_dir = os.path.dirname(os.path.dirname(daemon_msvc_dir))
daemon_build_dir = daemon_dir + r'\build'
contrib_src_dir = daemon_dir + r'\contrib\src'
contrib_build_dir = daemon_dir + r'\contrib\build'
contrib_tmp_dir = daemon_dir + r'\contrib\tarballs'
......@@ -244,13 +243,14 @@ def make_daemon(pkg_info, force, sdk_version, toolset):
env_set = 'false' if pkg_info.get('with_env', '') == '' else 'true'
sdk_to_use = sdk_version if env_set == 'false' else pkg_info.get(
'with_env', '')
build('daemon', daemon_build_dir,
build('daemon', daemon_dir,
pkg_info.get('project_paths', []),
pkg_info.get('custom_scripts', {}),
env_set,
sdk_to_use,
toolset,
conf=pkg_info.get('configuration', 'Release'))
conf=pkg_info.get('configuration', 'Release'),
use_cmake=pkg_info.get('use_cmake', False))
def make(pkg_info, force, sdk_version, toolset, isPlugin):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment