Merge with develop

--HG-- branch : compatibility-develop
9 years ago · 77ae086af8
parent fb41219ce8 07709e9cfc
commit 77ae086af8
1 changed files with 4 additions and 4 deletions
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@ -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)