libtabula

Check-in [0c16a98c03]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Moved the "tags" target to the top level. It's no use down in src.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0c16a98c03fc45371d5313e0cd34a71187fcea0a
User & Date: etr 2015-08-10 23:34:20
Context
2015-08-11
03:30
Updated OS X and Cygwin cases in exrun to match new CMake build system. (Linux was done previously.) check-in: cf319f7c5b user: tangent tags: trunk
2015-08-10
23:38
Merged trunk changes in check-in: 7d3a624647 user: etr tags: mysql-type-info
23:34
Moved the "tags" target to the top level. It's no use down in src. check-in: 0c16a98c03 user: etr tags: trunk
23:12
Manually merged the recent pthread changes from the mysql-type-info branch into trunk, where they should have been all along. check-in: e9bcb962a4 user: etr tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to CMakeLists.txt.

62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
...
138
139
140
141
142
143
144














#   - Cygwin
#   - CentOS 3?
#   - OpenIndiana
#
# - For each success above with CMake < 2.6, lower minimum requirement
#
# - Convert non-core top-level targets
#   - tags
#   - dist/rpm/deb/ebuild... via CPack
#   - abicheck
#
# ---------------------

cmake_minimum_required(VERSION 2.6)

................................................................................
add_subdirectory(src)
add_subdirectory(src/ssx)
add_subdirectory(test)
add_subdirectory(examples)

add_custom_target(dtest
	COMMAND ${PROJECT_SOURCE_DIR}/dtest -u test -p test)





















<







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
62
63
64
65
66
67
68

69
70
71
72
73
74
75
...
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
#   - Cygwin
#   - CentOS 3?
#   - OpenIndiana
#
# - For each success above with CMake < 2.6, lower minimum requirement
#
# - Convert non-core top-level targets

#   - dist/rpm/deb/ebuild... via CPack
#   - abicheck
#
# ---------------------

cmake_minimum_required(VERSION 2.6)

................................................................................
add_subdirectory(src)
add_subdirectory(src/ssx)
add_subdirectory(test)
add_subdirectory(examples)

add_custom_target(dtest
	COMMAND ${PROJECT_SOURCE_DIR}/dtest -u test -p test)

# If ctags is present, add a top-level "tags" target which includes all
# files in both the build and source versions of src/*.  Conditional
# since it isn't always present on *ix, and almost never on Windows.
find_program(CTAGS_PATH ctags)
if (CTAGS_PATH)
    message(STATUS "Found ctags: ${CTAGS_PATH}")
	set_source_files_properties(tags PROPERTIES GENERATED true)
	add_custom_target(tags 
			COMMAND ctags -R --c++-kinds=+p --fields=+iaS --extra=+q 
				${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
			COMMENT "Generating tags file..."
			WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
endif(CTAGS_PATH)

Changes to src/CMakeLists.txt.

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
..
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
add_custom_command(OUTPUT ssqls.h
    COMMAND ${SSQLS_PL}
    DEPENDS ${SSQLS_PL}
    COMMENT "Generating ssqls.h..."
    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src")

add_library(tabula SHARED
    tags

    querydef.h
    ssqls.h

    beemutex.cpp
    cmdline.cpp
    connection.cpp
    cpool.cpp
................................................................................
    transaction.cpp
    type_info.cpp
    uds_connection.cpp
    utility.cpp
    vallist.cpp
    wnp_connection.cpp
)

# Add a top-level "tags" target which includes all files in both
# the build and source versions of src/*.
set_source_files_properties(tags PROPERTIES GENERATED true)
add_custom_command(OUTPUT tags
    COMMAND ctags -R --c++-kinds=+p --fields=+iaS --extra=+q 
       ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
    COMMAND ln -sf ${CMAKE_CURRENT_BINARY_DIR}/tags ${CMAKE_BINARY_DIR}
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

# ...but only make it a dependency of libtabula if the ctags program
# is available, else it will fail to build on Windows.
find_program(CTAGS_PATH ctags)
if(CTAGS_PATH)
    message(STATUS "Found ctags: ${CTAGS_PATH}")
    add_dependencies(tabula tags)
endif(CTAGS_PATH)

target_link_libraries(tabula ${MYSQL_C_API_LIBRARY})







<
<







 







<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<

37
38
39
40
41
42
43


44
45
46
47
48
49
50
..
72
73
74
75
76
77
78


















79
add_custom_command(OUTPUT ssqls.h
    COMMAND ${SSQLS_PL}
    DEPENDS ${SSQLS_PL}
    COMMENT "Generating ssqls.h..."
    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src")

add_library(tabula SHARED


    querydef.h
    ssqls.h

    beemutex.cpp
    cmdline.cpp
    connection.cpp
    cpool.cpp
................................................................................
    transaction.cpp
    type_info.cpp
    uds_connection.cpp
    utility.cpp
    vallist.cpp
    wnp_connection.cpp
)


















target_link_libraries(tabula ${MYSQL_C_API_LIBRARY})