diff options
| author | Vicent Martà <vicent@github.com> | 2013-04-29 09:09:27 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-04-29 09:09:27 -0700 |
| commit | 51a91ce8c6d8129788841975e4ff213bc2953bb4 (patch) | |
| tree | 14d7d3bd881250a75c965be17236adc066c80d7d | |
| parent | 0f85c208406ef10e2f1c7fea6fb42ef52fe65134 (diff) | |
| parent | ac1d85cf11ceb8bf9c9600ce9c29d5d037220cfb (diff) | |
| download | libgit2-51a91ce8c6d8129788841975e4ff213bc2953bb4.tar.gz | |
Merge pull request #1513 from ethomson/cmake
cmake 2.6 parser bug workaround
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1831c8717..9f6b06bf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,7 +293,7 @@ TARGET_OS_LIBRARIES(git2) # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) # Win64+MSVC+static libs = linker error -IF(MSVC AND NOT BUILD_SHARED_LIBS AND (${CMAKE_SIZEOF_VOID_P} MATCHES "8") ) +IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64") ENDIF() |