=== modified file 'CHANGES' --- CHANGES revid:hemant.dangi@oracle.com-20150119121220-opq2fp064unvtcqj +++ CHANGES 2015-01-19 13:10:19 +0000 @@ -34,6 +34,7 @@ - wasNull() method call before fetching the data results in assert failure (Bug#19938873) - Memory leak if result set of prepared statement used (Bug#18135088/wl#7925) +- make install/fast fails if static library is not built (Bug#52281) GA 1.1.5 - - DatabaseMetaData::getProcedures() returns syntax error for connection option === modified file 'driver/CMakeLists.txt' --- driver/CMakeLists.txt revid:hemant.dangi@oracle.com-20150119121220-opq2fp064unvtcqj +++ driver/CMakeLists.txt 2015-01-19 13:08:38 +0000 @@ -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 # , like most @@ -302,10 +302,26 @@ 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)