diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2017-09-14 21:02:51 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2017-09-14 21:02:51 +0000 |
| commit | c91270bd8d6b60bd7c36fb2ad128e2a8165e0686 (patch) | |
| tree | 570aeb8e9fcad4efb19711621999d3df8296b6b9 /databases/kdb | |
| parent | 9620259fffa8cf46a8185e360528426f07898696 (diff) | |
| download | ports-c91270bd8d6b60bd7c36fb2ad128e2a8165e0686.tar.gz ports-c91270bd8d6b60bd7c36fb2ad128e2a8165e0686.zip | |
Update CMake to 3.9, merge devel/cmake-modules into devel/cmake
Thanks to antoine@ for the exp-run.
Approved by: rakuco (mentor)
Reviewed by: tcberner (mentor)
Reviewed by: mat
PR: 222000 (exp-run)
Differential Revision: https://reviews.freebsd.org/D12299
Notes
Notes:
svn path=/head/; revision=449853
Diffstat (limited to 'databases/kdb')
| -rw-r--r-- | databases/kdb/files/patch-src_CMakeLists.txt | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/kdb/files/patch-src_CMakeLists.txt b/databases/kdb/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..647f1820b9c3 --- /dev/null +++ b/databases/kdb/files/patch-src_CMakeLists.txt @@ -0,0 +1,31 @@ +This has been submitted upstream; the # TODO (GEN) is a comment used +elsewhere upstream to mark things commented-out for generated files. + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c63ab1f2..73d15fce 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -56,18 +56,18 @@ endif() + # Mark files as generated, set compile flags + set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.cpp + PROPERTIES +- GENERATED TRUE ++ #TODO(GEN) GENERATED TRUE + # YYERROR_VERBOSE=1 needed to get a token table for tokenName() even for release builds + COMPILE_FLAGS "-DYYERROR_VERBOSE=1 ${EXTRA_PARSER_COMPILE_FLAGS} " + ) +-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE) +-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE) +-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE) + + set_source_files_properties( + ${PARSER_SOURCE_DIR}/generated/sqlscanner.cpp + PROPERTIES +- GENERATED TRUE ++ #TODO(GEN) GENERATED TRUE + COMPILE_FLAGS "${EXTRA_SCANNER_COMPILE_FLAGS} " + ) + |