libtabula

Check-in [650133871e]
Login

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

Overview
Comment:Moved the configure_file() calls to the bottom of the top-level CMakeLists.txt file so they're after the recently-added C++11 tests. Otherwise, the wrong values get stored in src/config.h, and it can toggle on you, too.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:650133871e55c57adde8858e7dba041e4e28f8b9
User & Date: etr 2015-09-11 18:47:40
Context
2015-09-11
19:04
Simplified the C++ feature testing mechanism some check-in: 05f15e2b1c user: etr tags: trunk
18:47
Moved the configure_file() calls to the bottom of the top-level CMakeLists.txt file so they're after the recently-added C++11 tests. Otherwise, the wrong values get stored in src/config.h, and it can toggle on you, too. check-in: 650133871e user: etr tags: trunk
18:41
Added another C++11 test using the same mechanism from the previous one, this time for the cbegin/cend iterators, required on EL7, but which break the build on EL5's default GCC 4.1.2 compiler. Now we use them if present, and not if not. check-in: 9069ab8ffb user: etr tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to CMakeLists.txt.

122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
...
173
174
175
176
177
178
179










CHECK_SYMBOL_EXISTS(getopt unistd.h HAVE_POSIX_GETOPT)
if (NOT HAVE_POSIX_GETOPT)
	CHECK_SYMBOL_EXISTS(getopt libiberty.h HAVE_LIBIBERTY_GETOPT)
endif()

CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)

configure_file(abi.xml.in abi.xml)
configure_file(install.hta.in install.hta)
configure_file(libtabula.spec.in libtabula.spec)
configure_file(version.in version)
configure_file(doc/userman/userman.dbx.in doc/userman/userman.dbx)
configure_file(src/config.h.in src/config.h)
configure_file(src/Doxyfile.in src/Doxyfile)
configure_file(src/libtabula.h.in src/libtabula.h)
configure_file(src/ssx/Doxyfile.in src/ssx/Doxyfile)

include_directories(src ${PROJECT_BINARY_DIR}/src ${MYSQL_INCLUDE_DIR})
get_filename_component(MYSQL_LIBRARY_DIR "${MYSQL_LIBRARY}" PATH)
link_directories(${MYSQL_LIBRARY_DIR})

add_subdirectory(cmake)
add_subdirectory(doc)
add_subdirectory(src)
................................................................................
	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)

















<
<
<
<
<
<
<
<
<
<







 







>
>
>
>
>
>
>
>
>
>
122
123
124
125
126
127
128










129
130
131
132
133
134
135
...
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
CHECK_SYMBOL_EXISTS(getopt unistd.h HAVE_POSIX_GETOPT)
if (NOT HAVE_POSIX_GETOPT)
	CHECK_SYMBOL_EXISTS(getopt libiberty.h HAVE_LIBIBERTY_GETOPT)
endif()

CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)











include_directories(src ${PROJECT_BINARY_DIR}/src ${MYSQL_INCLUDE_DIR})
get_filename_component(MYSQL_LIBRARY_DIR "${MYSQL_LIBRARY}" PATH)
link_directories(${MYSQL_LIBRARY_DIR})

add_subdirectory(cmake)
add_subdirectory(doc)
add_subdirectory(src)
................................................................................
	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)

configure_file(abi.xml.in abi.xml)
configure_file(install.hta.in install.hta)
configure_file(libtabula.spec.in libtabula.spec)
configure_file(version.in version)
configure_file(doc/userman/userman.dbx.in doc/userman/userman.dbx)
configure_file(src/config.h.in src/config.h)
configure_file(src/Doxyfile.in src/Doxyfile)
configure_file(src/libtabula.h.in src/libtabula.h)
configure_file(src/ssx/Doxyfile.in src/ssx/Doxyfile)