mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-21 00:18:43 +00:00
Fixed: #1321 Adopt WITH_STATIC_EXTERNAL for Mac OS X
This commit is contained in:
parent
e3d0ed9c20
commit
a66e4ecd90
1 changed files with 10 additions and 4 deletions
|
@ -640,13 +640,19 @@ MACRO(SETUP_EXTERNAL)
|
||||||
ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
||||||
ENDIF(MSVC10)
|
ENDIF(MSVC10)
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
IF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
|
IF(APPLE)
|
||||||
IF(WITH_STATIC_EXTERNAL)
|
IF(WITH_STATIC_EXTERNAL)
|
||||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .dylib .so)
|
||||||
ELSE(WITH_STATIC_EXTERNAL)
|
ELSE(WITH_STATIC_EXTERNAL)
|
||||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
|
SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
|
||||||
ENDIF(WITH_STATIC_EXTERNAL)
|
ENDIF(WITH_STATIC_EXTERNAL)
|
||||||
ENDIF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
|
ELSE(APPLE)
|
||||||
|
IF(WITH_STATIC_EXTERNAL)
|
||||||
|
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
|
||||||
|
ELSE(WITH_STATIC_EXTERNAL)
|
||||||
|
SET(CMAKE_FIND_LIBRARY_SUFFIXES .so .a)
|
||||||
|
ENDIF(WITH_STATIC_EXTERNAL)
|
||||||
|
ENDIF(APPLE)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
IF(WITH_STLPORT)
|
IF(WITH_STLPORT)
|
||||||
|
|
Loading…
Reference in a new issue