From: xantares <xantares09@hotmail.com>
Date: Tue, 6 May 2014 21:07:02 +0000 (+0200)
Subject: Merge master
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=74ab17e5260db970104607467a7ec58729c28c98;p=nlopt.git

Merge master
---

74ab17e5260db970104607467a7ec58729c28c98
diff --cc CMakeLists.txt
index 032c067,ee7c6ee..6a29b59
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -143,21 -139,12 +143,22 @@@ SET ( NLOPT_SOURCE
  	stogo/global.cc stogo/linalg.cc stogo/local.cc stogo/stogo.cc stogo/tools.cc stogo/global.h stogo/linalg.h stogo/local.h stogo/stogo_config.h stogo/stogo.h stogo/tools.h 
          )
  
- OPTION(NLOPT_BUILD_SHARED "Build NLOPT as a shared library" OFF )
+ OPTION(BUILD_SHARED_LIBS "Build NLOPT as a shared library" OFF )
  
- IF(NLOPT_BUILD_SHARED)
+ IF(BUILD_SHARED_LIBS)
    ADD_DEFINITIONS(-DNLOPT_DLL)
    ADD_DEFINITIONS(-DNLOPT_DLL_EXPORT )
-   ADD_LIBRARY (nlopt SHARED ${NLOPT_SOURCES} )
- ELSE(NLOPT_BUILD_SHARED)
-   ADD_LIBRARY (nlopt STATIC ${NLOPT_SOURCES} )
- ENDIF(NLOPT_BUILD_SHARED)
- 
- INSTALL ( TARGETS nlopt
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib${LIB_SUFFIX}
-           ARCHIVE DESTINATION lib${LIB_SUFFIX}
-         )
+ ENDIF(BUILD_SHARED_LIBS)
  
 -ADD_LIBRARY (nlopt ${NLOPT_SOURCES} )
 -    
 +INSTALL ( FILES ${NLOPT_HEADERS} DESTINATION include )
 +
++ADD_LIBRARY (nlopt ${NLOPT_SOURCES} )
++
++INSTALL ( TARGETS nlopt
++          RUNTIME DESTINATION bin
++          LIBRARY DESTINATION lib${LIB_SUFFIX}
++          ARCHIVE DESTINATION lib${LIB_SUFFIX}
++        )
++
++
++