linphone-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Linphone-users] fix target name in multiple CMakeLists.txt files when E


From: balducci
Subject: [Linphone-users] fix target name in multiple CMakeLists.txt files when ENABLE_STATIC=ON
Date: Sun, 02 May 2021 11:24:59 +0200

hello

the following cmake files need fixing the target name when
ENABLE_STATIC=ON

ciao
-gabriele


liblinphone/src/CMakeLists.txt
==============================
----8<----
diff -c src/CMakeLists.txt.LINPHONE_FIX_ADD_LIBRARY src/CMakeLists.txt
*** src/CMakeLists.txt.LINPHONE_FIX_ADD_LIBRARY Sun May  2 09:16:10 2021
--- src/CMakeLists.txt  Sun May  2 09:16:10 2021
***************
*** 581,589 ****
  
        if (ENABLE_FLEXIAPI)
                if (XCODE)
!                       target_link_libraries(linphone PRIVATE jsoncpp_static)
                else()
!                       target_link_libraries(linphone PRIVATE jsoncpp_object)
                endif()
        endif()
  
--- 581,589 ----
  
        if (ENABLE_FLEXIAPI)
                if (XCODE)
!                       target_link_libraries(linphone-static PRIVATE 
jsoncpp_static)
                else()
!                       target_link_libraries(linphone-static PRIVATE 
jsoncpp_object)
                endif()
        endif()
---->8----


bzrtp/src/CMakeLists.txt
========================
----8<----
diff -c src/CMakeLists.txt.BZRTP_FIX_ADD_LIBRARY src/CMakeLists.txt
*** src/CMakeLists.txt.BZRTP_FIX_ADD_LIBRARY    Sun May  2 09:11:56 2021
--- src/CMakeLists.txt  Sun May  2 09:11:56 2021
***************
*** 55,67 ****
  endif()
  
  if(ENABLE_STATIC)
!       add_library(bzrtp STATIC ${SOURCE_FILES})
!       set_target_properties(bzrtp PROPERTIES OUTPUT_NAME bzrtp)
!       target_include_directories(bzrtp INTERFACE
                $<INSTALL_INTERFACE:include>
                PRIVATE ${INCLUDE_DIRS})
!       target_link_libraries(bzrtp PUBLIC bctoolbox ${LIBS})
!       install(TARGETS bzrtp EXPORT ${EXPORT_TARGETS_NAME}Targets
                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
        )
--- 55,67 ----
  endif()
  
  if(ENABLE_STATIC)
!       add_library(bzrtp-static STATIC ${SOURCE_FILES})
!       set_target_properties(bzrtp-static PROPERTIES OUTPUT_NAME bzrtp)
!       target_include_directories(bzrtp-static INTERFACE
                $<INSTALL_INTERFACE:include>
                PRIVATE ${INCLUDE_DIRS})
!       target_link_libraries(bzrtp-static PUBLIC bctoolbox ${LIBS})
!       install(TARGETS bzrtp-static EXPORT ${EXPORT_TARGETS_NAME}Targets
                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
        )
---->8----


belr/src/CMakeLists.txt
=======================
----8<----
diff -c src/CMakeLists.txt.BELR_FIX_ADD_LIBRARY src/CMakeLists.txt
*** src/CMakeLists.txt.BELR_FIX_ADD_LIBRARY     Sun May  2 09:12:58 2021
--- src/CMakeLists.txt  Sun May  2 09:12:58 2021
***************
*** 44,53 ****
  endif()
  
  if(ENABLE_STATIC)
!       add_library(belr STATIC ${BELR_HEADER_FILES} ${BELR_SOURCE_FILES_C} 
${BELR_SOURCE_FILES_CXX})
!       set_target_properties(belr PROPERTIES OUTPUT_NAME belr)
!       target_link_libraries(belr PUBLIC ${LIBS})
!       target_include_directories(belr INTERFACE
                $<INSTALL_INTERFACE:include>
                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
        )
--- 44,53 ----
  endif()
  
  if(ENABLE_STATIC)
!       add_library(belr-static STATIC ${BELR_HEADER_FILES} 
${BELR_SOURCE_FILES_C} ${BELR_SOURCE_FILES_CXX})
!       set_target_properties(belr-static PROPERTIES OUTPUT_NAME belr)
!       target_link_libraries(belr-static PUBLIC ${LIBS})
!       target_include_directories(belr-static INTERFACE
                $<INSTALL_INTERFACE:include>
                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
        )
---->8----


belcard/src/CMakeLists.txt
==========================
----8<----
diff -c src/CMakeLists.txt.BELCARD_FIX_ADD_LIBRARY src/CMakeLists.txt
*** src/CMakeLists.txt.BELCARD_FIX_ADD_LIBRARY  Sun May  2 09:13:11 2021
--- src/CMakeLists.txt  Sun May  2 09:13:11 2021
***************
*** 49,57 ****
  bc_apply_compile_flags(BELCARD_SOURCE_FILES_CXX STRICT_OPTIONS_CPP 
STRICT_OPTIONS_CXX)
  
  if(ENABLE_STATIC)
!       add_library(belcard STATIC ${BELCARD_HEADER_FILES} 
${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX})
!       set_target_properties(belcard PROPERTIES OUTPUT_NAME belcard)
!       target_link_libraries(belcard PRIVATE belr bctoolbox)
  endif()
  if(ENABLE_SHARED)
        add_library(belcard SHARED ${BELCARD_HEADER_FILES} 
${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX} ${VCARD_GRAMMAR_FILES})
--- 49,57 ----
  bc_apply_compile_flags(BELCARD_SOURCE_FILES_CXX STRICT_OPTIONS_CPP 
STRICT_OPTIONS_CXX)
  
  if(ENABLE_STATIC)
!       add_library(belcard-static STATIC ${BELCARD_HEADER_FILES} 
${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX})
!       set_target_properties(belcard-static PROPERTIES OUTPUT_NAME belcard)
!       target_link_libraries(belcard-static PRIVATE belr bctoolbox)
  endif()
  if(ENABLE_SHARED)
        add_library(belcard SHARED ${BELCARD_HEADER_FILES} 
${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX} ${VCARD_GRAMMAR_FILES})
---->8----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]