Attachment #385924 for bug #442662

View | Details | Raw Unified | Return to bug 442662
Collapse All | Expand All





if(COMMAND cmake_policy AND POLICY CMP0015)
	cmake_policy(SET CMP0015 NEW)
endif(COMMAND cmake_policy AND POLICY CMP0015)

#-----------------
# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment

	${CPACK_RESOURCE_FILE_LICENSE}
	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
	DESTINATION "${INSTALL_DOCS}" OPTIONAL)

SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
    ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
	"install_manifest.txt")
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )

SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
SET(CPACK_SOURCE_GENERATOR "TGZ")


ADD_SUBDIRECTORY(cppconn)
ADD_SUBDIRECTORY(driver)
ADD_SUBDIRECTORY(examples)
ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(test/framework)
ADD_SUBDIRECTORY(test/CJUnitTestsPort)
ADD_SUBDIRECTORY(test/unit)

IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
	# see also README

Lines 58-64 Link Here

(-)a/FindMySQL.cm (-1 / +1 lines)
58	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"	58	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
59	OUTPUT_VARIABLE _mysql_config_output	59	OUTPUT_VARIABLE _mysql_config_output
60	)	60	)
61	STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")	61	STRING(REGEX MATCHALL "\<-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
62	STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")	62	STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
63	# ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")	63	# ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
64	ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)	64	ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)

Lines 55-61 Link Here

(-)a/cppconn/CMakeLists.txt (-1 / +1 lines)
55		55
56	SET(MYSQLCPPCONN_INSTALL_HEADERS	56	SET(MYSQLCPPCONN_INSTALL_HEADERS
57	build_config.h	57	build_config.h
58	config.h	58	${CMAKE_CURRENT_BINARY_DIR}/config.h
59	connection.h	59	connection.h
60	datatype.h	60	datatype.h
61	driver.h	61	driver.h





INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")


		nativeapi/native_statement_wrapper.h
		nativeapi/mysql_native_resultset_wrapper.h
		nativeapi/native_resultset_wrapper.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
		${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
		${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h

	)


	)
ELSE(WIN32)
	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
		LIBRARY DESTINATION lib${LIB_SUFFIX}
		ARCHIVE DESTINATION lib${LIB_SUFFIX}
	)
ENDIF(WIN32)


Return to bug 442662

Lines 38-44 Link Here

(-)a/CMakeLists.txt (-7 / +3 lines)
38		38
39	if(COMMAND cmake_policy AND POLICY CMP0015)	39	if(COMMAND cmake_policy AND POLICY CMP0015)
40	cmake_policy(SET CMP0015 NEW)	40	cmake_policy(SET CMP0015 NEW)
41	endif(COMMAND cmake_policy)	41	endif(COMMAND cmake_policy AND POLICY CMP0015)
42		42
43	#-----------------	43	#-----------------
44	# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment	44	# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
Lines 258-271 Link Here
258	${CPACK_RESOURCE_FILE_LICENSE}	258	${CPACK_RESOURCE_FILE_LICENSE}
259	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"	259	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
260	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"	260	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
261	DESTINATION "." OPTIONAL)	261	DESTINATION "${INSTALL_DOCS}" OPTIONAL)
262		262
263	SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"	263	SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
264	".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"	264	".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
265	"install_manifest.txt")	265	"install_manifest.txt")
266	SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )	266	SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
267		267
268	SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")	268	SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
269	SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )	269	SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
270	SET(CPACK_SOURCE_GENERATOR "TGZ")	270	SET(CPACK_SOURCE_GENERATOR "TGZ")
271		271
Lines 292-301 Link Here
292	ADD_SUBDIRECTORY(cppconn)	292	ADD_SUBDIRECTORY(cppconn)
293	ADD_SUBDIRECTORY(driver)	293	ADD_SUBDIRECTORY(driver)
294	ADD_SUBDIRECTORY(examples)	294	ADD_SUBDIRECTORY(examples)
295	ADD_SUBDIRECTORY(test)
296	ADD_SUBDIRECTORY(test/framework)
297	ADD_SUBDIRECTORY(test/CJUnitTestsPort)
298	ADD_SUBDIRECTORY(test/unit)
299		295
300	IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")	296	IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
301	# see also README	297	# see also README

Lines 26-31 Link Here

(-)a/driver/CMakeLists.txt (-16 / +21 lines)
26		26
27	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})	27	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
28	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)	28	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
		29	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
		30	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
		31	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
29	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})	32	INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
30	MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")	33	MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
31		34
Lines 149-168 Link Here
149	nativeapi/native_statement_wrapper.h	152	nativeapi/native_statement_wrapper.h
150	nativeapi/mysql_native_resultset_wrapper.h	153	nativeapi/mysql_native_resultset_wrapper.h
151	nativeapi/native_resultset_wrapper.h	154	nativeapi/native_resultset_wrapper.h
152	../cppconn/warning.h	155	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
153	../cppconn/statement.h	156	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
154	../cppconn/sqlstring.h	157	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
155	../cppconn/resultset_metadata.h	158	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
156	../cppconn/resultset.h	159	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
157	../cppconn/prepared_statement.h	160	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
158	../cppconn/parameter_metadata.h	161	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
159	../cppconn/metadata.h	162	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
160	../cppconn/exception.h	163	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
161	../cppconn/driver.h	164	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
162	../cppconn/datatype.h	165	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
163	../cppconn/connection.h	166	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
164	../cppconn/config.h	167	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
165	../cppconn/build_config.h	168	${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
		169	${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
		170	${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
166		171
167	)	172	)
168		173
Lines 271-278 Link Here
271	)	276	)
272	ELSE(WIN32)	277	ELSE(WIN32)
273	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static	278	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
274	LIBRARY DESTINATION lib	279	LIBRARY DESTINATION lib${LIB_SUFFIX}
275	ARCHIVE DESTINATION lib	280	ARCHIVE DESTINATION lib${LIB_SUFFIX}
276	)	281	)
277	ENDIF(WIN32)	282	ENDIF(WIN32)
278		283