Fixes memory leak in auglag/auglag.c

[nlopt.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a7ba0cf5e1eee5b92e7faa69c9ad9d6b84e9dc7..1c7a67c0ee39f3f9134ceae7a1fa00ccb9859ca8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,10 +145,15 @@ SET ( NLOPT_SOURCES
 \r
 OPTION(BUILD_SHARED_LIBS "Build NLOPT as a shared library" OFF )\r
 \r
-IF(BUILD_SHARED_LIBS)\r
+if (BUILD_SHARED_LIBS)\r
   ADD_DEFINITIONS(-DNLOPT_DLL)\r
   ADD_DEFINITIONS(-DNLOPT_DLL_EXPORT )\r
-ENDIF(BUILD_SHARED_LIBS)\r
+  \r
+  if (NOT CMAKE_INSTALL_PREFIX MATCHES "^/usr")\r
+    set (CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})\r
+    set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)\r
+  endif ()\r
+endif ()\r
 \r
 INSTALL ( FILES ${NLOPT_HEADERS} DESTINATION include )\r
 \r
@@ -164,9 +169,6 @@ IF (_VERSION_INFO_LINE)
   SET(_INFO_VERSION "${_INFO_SOVERSION}.${_VERSION_INFO_AGE}.${_VERSION_INFO_REVISION}")\r
   SET_TARGET_PROPERTIES(nlopt PROPERTIES SOVERSION ${_INFO_SOVERSION})\r
   SET_TARGET_PROPERTIES(nlopt PROPERTIES VERSION ${_INFO_VERSION} )\r
-  IF (WIN32)\r
-    SET_TARGET_PROPERTIES(nlopt PROPERTIES SUFFIX -${_INFO_SOVERSION}.dll)\r
-  ENDIF ()\r
 ENDIF ()\r
 \r
 INSTALL ( TARGETS nlopt\r
@@ -175,5 +177,4 @@ INSTALL ( TARGETS nlopt
           ARCHIVE DESTINATION lib${LIB_SUFFIX}\r
         )\r
 \r
-\r
-    \r
+add_subdirectory (swig)\r