Attachment #341410 for bug #442322

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




SET(CONNECTOR_MAJOR "5")
SET(CONNECTOR_MINOR "2")

IF(WITH_DOCUMENTATION_INSTALL_PATH)
	set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
	set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)

IF(CONNECTOR_MINOR LESS 10)
	SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
ELSE(CONNECTOR_MINOR LESS 10)


ELSE(WIN32)

    INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
    INSTALL(FILES README       DESTINATION ${DOCUMENTATION_INSTALL_PATH})
    INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
    INSTALL(FILES INSTALL      DESTINATION ${DOCUMENTATION_INSTALL_PATH})
  IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
    INSTALL(FILES COPYING       DESTINATION ${DOCUMENTATION_INSTALL_PATH})
  ELSE()
    INSTALL(FILES LICENSE.mysql DESTINATION ${DOCUMENTATION_INSTALL_PATH})
  ENDIF()

ENDIF(WIN32)

INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})

INCLUDE(CPack)


Lines 22-27 Link Here

(-)test/CMakeLists.txt (-2 / +8 lines)
22		22
23	##########################################################################	23	##########################################################################
24		24
		25	IF(WITH_TEST_INSTALL_PATH)
		26	SET(TEST_INSTALL_PATH ${WITH_TEST_INSTALL_PATH})
		27	ELSE(WITH_TEST_INSTALL_PATH)
		28	SET(TEST_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}/test)
		29	ENDIF(WITH_TEST_INSTALL_PATH)
		30
25	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test)	31	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test)
26		32
27	# put the test exe's in test/	33	# put the test exe's in test/
Lines 44-50 Link Here
44	my_types my_unicode my_unixodbc my_use_result my_bug13766)	50	my_types my_unicode my_unixodbc my_use_result my_bug13766)
45	ADD_EXECUTABLE(${T} ${T}.c)	51	ADD_EXECUTABLE(${T} ${T}.c)
46		52
47	INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests)	53	INSTALL(TARGETS ${T} DESTINATION ${TEST_INSTALL_PATH} COMPONENT tests)
48		54
49	IF(WIN32)	55	IF(WIN32)
50	TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB})	56	TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB})
Lines 59-64 Link Here
59	${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake	65	${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake
60	${CMAKE_CURRENT_BINARY_DIR}/odbc.ini	66	${CMAKE_CURRENT_BINARY_DIR}/odbc.ini
61	${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini	67	${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini
62	DESTINATION test COMPONENT tests)	68	DESTINATION ${TEST_INSTALL_PATH} COMPONENT tests)
63		69
64		70

Return to bug 442322

Lines 33-38 Link Here

(-)CMakeLists.txt (-7 / +13 lines)
33	SET(CONNECTOR_MAJOR "5")	33	SET(CONNECTOR_MAJOR "5")
34	SET(CONNECTOR_MINOR "2")	34	SET(CONNECTOR_MINOR "2")
35		35
		36	IF(WITH_DOCUMENTATION_INSTALL_PATH)
		37	set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
		38	ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
		39	set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
		40	ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
		41
36	IF(CONNECTOR_MINOR LESS 10)	42	IF(CONNECTOR_MINOR LESS 10)
37	SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")	43	SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
38	ELSE(CONNECTOR_MINOR LESS 10)	44	ELSE(CONNECTOR_MINOR LESS 10)
Lines 329-347 Link Here
329		335
330	ELSE(WIN32)	336	ELSE(WIN32)
331		337
332	INSTALL(FILES ChangeLog DESTINATION .)	338	INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH})
333	INSTALL(FILES README DESTINATION .)	339	INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH})
334	INSTALL(FILES README.debug DESTINATION .)	340	INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
335	INSTALL(FILES INSTALL DESTINATION .)	341	INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH})
336	IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")	342	IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
337	INSTALL(FILES COPYING DESTINATION .)	343	INSTALL(FILES COPYING DESTINATION ${DOCUMENTATION_INSTALL_PATH})
338	ELSE()	344	ELSE()
339	INSTALL(FILES LICENSE.mysql DESTINATION .)	345	INSTALL(FILES LICENSE.mysql DESTINATION ${DOCUMENTATION_INSTALL_PATH})
340	ENDIF()	346	ENDIF()
341		347
342	ENDIF(WIN32)	348	ENDIF(WIN32)
343		349
344	INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)	350	INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
345		351
346	INCLUDE(CPack)	352	INCLUDE(CPack)
347		353