Merge with develop
This commit is contained in:
parent
8a6598270c
commit
1399b4d9d5
1 changed files with 4 additions and 4 deletions
|
@ -1084,15 +1084,15 @@ MACRO(SETUP_EXTERNAL)
|
|||
IF(APPLE)
|
||||
IF(WITH_STATIC_EXTERNAL)
|
||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a)
|
||||
ELSE(WITH_STATIC_EXTERNAL)
|
||||
ELSE()
|
||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
|
||||
ENDIF(WITH_STATIC_EXTERNAL)
|
||||
ENDIF()
|
||||
ELSE(APPLE)
|
||||
IF(WITH_STATIC_EXTERNAL)
|
||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
|
||||
ELSE(WITH_STATIC_EXTERNAL)
|
||||
ELSE()
|
||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .so .a)
|
||||
ENDIF(WITH_STATIC_EXTERNAL)
|
||||
ENDIF()
|
||||
ENDIF(APPLE)
|
||||
ENDIF(WIN32)
|
||||
|
||||
|
|
Loading…
Reference in a new issue