diff -r ./CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/CMakeLists.txt 90,96c90,95 < < IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") < SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") < ELSE(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") < SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.mysql") < ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") < SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") --- > IF(EXISTS "COPYING") > SET(CPACK_RESOURCE_FILE_LICENSE "COPYING") > ELSE(EXISTS "COPYING") > SET(CPACK_RESOURCE_FILE_LICENSE "LICENSE.mysql") > ENDIF(EXISTS "COPYING") > SET(CPACK_RESOURCE_FILE_README "README") 115c114 < SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")") --- > SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")") 118c117 < INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL) --- > INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "ANNOUNCEMENT" DESTINATION "." OPTIONAL) 145,147d143 < # set the include path for the cppconn api < INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) < INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # for the generated config.h in the build directory Only in .: build diff -r ./cppconn/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/cppconn/CMakeLists.txt 45c45 < ${CMAKE_CURRENT_BINARY_DIR}/config.h --- > config.h Only in ../orig/mysql-connector-c++-1.0.5/cppconn: config.h diff -r ./cppconn/connection.h ../orig/mysql-connector-c++-1.0.5/cppconn/connection.h 18,19c18,19 < #include "cppconn/build_config.h" < #include "cppconn/warning.h" --- > #include "build_config.h" > #include "warning.h" diff -r ./cppconn/driver.h ../orig/mysql-connector-c++-1.0.5/cppconn/driver.h 17,18c17,18 < #include "cppconn/connection.h" < #include "cppconn/build_config.h" --- > #include "connection.h" > #include "build_config.h" diff -r ./cppconn/exception.h ../orig/mysql-connector-c++-1.0.5/cppconn/exception.h 15c15 < #include "cppconn/build_config.h" --- > #include "build_config.h" diff -r ./cppconn/metadata.h ../orig/mysql-connector-c++-1.0.5/cppconn/metadata.h 17c17 < #include "cppconn/datatype.h" --- > #include "datatype.h" diff -r ./cppconn/prepared_statement.h ../orig/mysql-connector-c++-1.0.5/cppconn/prepared_statement.h 17c17 < #include "cppconn/statement.h" --- > #include "statement.h" diff -r ./cppconn/resultset.h ../orig/mysql-connector-c++-1.0.5/cppconn/resultset.h 15c15 < #include "cppconn/config.h" --- > #include "config.h" 21c21 < #include "cppconn/resultset_metadata.h" --- > #include "resultset_metadata.h" diff -r ./cppconn/resultset_metadata.h ../orig/mysql-connector-c++-1.0.5/cppconn/resultset_metadata.h 16c16 < #include "cppconn/datatype.h" --- > #include "datatype.h" diff -r ./cppconn/statement.h ../orig/mysql-connector-c++-1.0.5/cppconn/statement.h 15,16c15,16 < #include "cppconn/config.h" < #include "cppconn/resultset.h" --- > #include "config.h" > #include "resultset.h" diff -r ./driver/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/driver/CMakeLists.txt 12a13,16 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) > > diff -r ./examples/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/examples/CMakeLists.txt 13a14 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) 16a18,19 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR/cppconn}) > diff -r ./test/CJUnitTestsPort/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/test/CJUnitTestsPort/CMakeLists.txt 9a10,12 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) > diff -r ./test/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/test/CMakeLists.txt 9a10 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) diff -r ./test/framework/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/test/framework/CMakeLists.txt 9a10,12 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) > diff -r ./test/unit/CMakeLists.txt ../orig/mysql-connector-c++-1.0.5/test/unit/CMakeLists.txt 9a10,12 > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) > INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) >