From f7baf66f3a55d45862c822c54a5973fea199d7ea Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Mon, 30 Oct 2023 15:37:40 -0400 Subject: [PATCH] misc: rename jami -> jami-core This will allow us to use add_subdirectory in the client CMakeLists.txt. Change-Id: Ibb0584f955c0047ac51c248342907d4e79f2b973 --- CMakeLists.txt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e62d5ee510..56fce43b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -project(jami +project(jami-core VERSION 13.11.0 LANGUAGES C CXX) set(PACKAGE_NAME "Jami Daemon") @@ -230,12 +230,6 @@ 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") target_compile_definitions(${PROJECT_NAME} PRIVATE PACKAGE_NAME="${PACKAGE_NAME}" @@ -299,14 +293,6 @@ if(MSVC) set(CMAKE_SUPPRESS_REGENERATION true) set(ROOT_NAMESPACE ringdaemon) - ################################################################################ - # Target name - ################################################################################ - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - TARGET_NAME_RELEASE "jami" - ) - endif() ################################################################################ # Output directory ################################################################################ -- GitLab