Bug#52281: make install/fast fails if static library is not built

Hemant Dangi · Hemant Dangi · commit 28d14898853f · 2015-01-21T20:16:54.000+05:30
diff --git a/CHANGES b/CHANGES
@@ -36,6 +36,7 @@ GA  1.1.6 -
 - Memory leak if result set of prepared statement used (Bug#18135088/wl#7925)
 - ResultSet::getString does not return fractional seconds from DATETIME(N)
   columns (Bug#68523)
+- make install/fast fails if static library is not built (Bug#52281)
 
 GA  1.1.5 -
 - DatabaseMetaData::getProcedures() returns syntax error for connection option
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -302,10 +302,26 @@ IF(WIN32)
     ARCHIVE DESTINATION lib
   )
 ELSE(WIN32)
-  INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
-    LIBRARY DESTINATION ${INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${INSTALL_LIBDIR}
-  )
+  IF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC)
+    IF(ENABLE_BUILD_DYNAMIC)
+      INSTALL(TARGETS mysqlcppconn
+        LIBRARY DESTINATION ${INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+      )
+    ENDIF(ENABLE_BUILD_DYNAMIC)
+
+    IF(ENABLE_BUILD_STATIC)
+      INSTALL(TARGETS mysqlcppconn-static
+        LIBRARY DESTINATION ${INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+      )
+    ENDIF(ENABLE_BUILD_STATIC)
+  ELSE(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC)
+    INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
+      LIBRARY DESTINATION ${INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+    )
+  ENDIF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC)
 ENDIF(WIN32)
 
 
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
