diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2018-01-07 15:40:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 15:40:06 +0000 |
| commit | ddd36510b589f8dd39a9bfaaecfb9160dc943f42 (patch) | |
| tree | 9ebad5cd0eac45c017a3bc5e6e9dcc08a41ae0de | |
| parent | 70db57d4a431dae2edcf19e92a84db8d6cf4f935 (diff) | |
| parent | 85e40bbf0938cac5668e810864f6be9619b9e60e (diff) | |
| download | libgit2-ddd36510b589f8dd39a9bfaaecfb9160dc943f42.tar.gz | |
Merge pull request #4467 from libgit2/cmn/static-archive-later
cmake: move the rule to find static archives close to building clar
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a4d91a4..d4b31364b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,10 +222,6 @@ IF (MSVC) SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}") ELSE () - IF (NOT BUILD_SHARED_LIBS) - SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") - ENDIF() - IF (ENABLE_REPRODUCIBLE_BUILDS) SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>") SET(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> Dq <TARGET> <LINK_FLAGS> <OBJECTS>") @@ -304,6 +300,12 @@ ENDIF() ADD_SUBDIRECTORY(src) # Tests +IF (NOT MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") + ENDIF() +ENDIF () + IF (BUILD_CLAR) ENABLE_TESTING() ADD_SUBDIRECTORY(tests) |