proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 07:03:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3483 from ethomson/cmake_xcode

Browse Source 
cmake: split sources into original paths for Xcode and MSVC
This commit is contained in:
Carlos Martín Nieto 2015-10-23 15:16:21 +02:00
commit 979a5c120c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -137,13 +137,13 @@ FUNCTION(TARGET_OS_LIBRARIES target)
ENDIF() ENDIF()
ENDFUNCTION() ENDFUNCTION()
# For the MSVC IDE, this function splits up the source files like windows # This function splits the sources files up into their appropriate
# explorer does. This is esp. useful with the libgit2_clar project, were # subdirectories. This is especially useful for IDEs like Xcode and
# usually 2 or more files share the same name. Sadly, this file grouping # Visual Studio, so that you can navigate into the libgit2_clar project,
# is a per-directory option in cmake and not per-target, resulting in # and see the folders within the tests folder (instead of just seeing all
# empty virtual folders "tests" for the git2.dll # source and tests in a single folder.)
FUNCTION(MSVC_SPLIT_SOURCES target) FUNCTION(IDE_SPLIT_SOURCES target)
IF(MSVC_IDE) IF(MSVC_IDE OR CMAKE_GENERATOR STREQUAL Xcode)
GET_TARGET_PROPERTY(sources ${target} SOURCES) GET_TARGET_PROPERTY(sources ${target} SOURCES)
FOREACH(source ${sources}) FOREACH(source ${sources})
IF(source MATCHES ".*/") IF(source MATCHES ".*/")
@ -560,7 +560,7 @@ IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64") SET_TARGET_PROPERTIES(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
ENDIF() ENDIF()
MSVC_SPLIT_SOURCES(git2) IDE_SPLIT_SOURCES(git2)
IF (SONAME) IF (SONAME)
SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING})
@ -629,7 +629,7 @@ IF (BUILD_CLAR)
TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES}) TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES})
TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES}) TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES})
TARGET_OS_LIBRARIES(libgit2_clar) TARGET_OS_LIBRARIES(libgit2_clar)
MSVC_SPLIT_SOURCES(libgit2_clar) IDE_SPLIT_SOURCES(libgit2_clar)
IF (MSVC_IDE) IF (MSVC_IDE)
# Precompiled headers # Precompiled headers