fix Thirdparty.cmake install

This commit is contained in:
ruanshudong 2020-03-12 14:08:46 +08:00
parent d89067c3bb
commit 614f02646f
4 changed files with 1343 additions and 1279 deletions

View File

@ -1,19 +1,11 @@
if (WIN32) option(TARS_MYSQL "option for mysql" ON)
option(TARS_MYSQL "option for mysql" OFF)
else ()
option(TARS_MYSQL "option for mysql" ON)
endif ()
option(TARS_SSL "option for ssl" OFF) option(TARS_SSL "option for ssl" OFF)
option(TARS_HTTP2 "option for http2" OFF) option(TARS_HTTP2 "option for http2" OFF)
option(TARS_PROTOBUF "option for protocol" OFF) option(TARS_PROTOBUF "option for protocol" OFF)
if (TARS_MYSQL) if (TARS_MYSQL)
add_definitions(-DTARS_MYSQL=1) add_definitions(-DTARS_MYSQL=1)
# if(WIN32)
# set(TARS_SSL ON)
# endif()
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
FIND_PACKAGE(Curses) FIND_PACKAGE(Curses)
@ -72,9 +64,9 @@ if (WIN32)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND cmake --build . --config release BUILD_COMMAND cmake --build . --config release
LOG_CONFIGURE 1 INSTALL_COMMAND cmake --build . --config release --target install
LOG_BUILD 1 # LOG_CONFIGURE 1
# INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE} # LOG_BUILD 1
URL_MD5 82358affdd7ab94854c8ee73a180fc53 URL_MD5 82358affdd7ab94854c8ee73a180fc53
) )
else() else()
@ -87,8 +79,8 @@ else()
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
# INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE} # INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE}
URL_MD5 ecd1fa65e7de707cd5c00bdac56022cd URL_MD5 ecd1fa65e7de707cd5c00bdac56022cd
) )
@ -120,8 +112,8 @@ if (TARS_PROTOBUF)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/protobuf-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/protobuf-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND cmake --build . --config release BUILD_COMMAND cmake --build . --config release
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
# INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE} # INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE}
URL_MD5 fb59398329002c98d4d92238324c4187 URL_MD5 fb59398329002c98d4d92238324c4187
) )
@ -138,8 +130,8 @@ if (TARS_PROTOBUF)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/protobuf-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/protobuf-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
# INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE} # INSTALL_COMMAND cmake -P ${RUN_PROTOBUF_INSTALL_FILE}
URL_MD5 fb59398329002c98d4d92238324c4187 URL_MD5 fb59398329002c98d4d92238324c4187
) )
@ -174,8 +166,8 @@ if (TARS_SSL)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND nmake BUILD_COMMAND nmake
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
INSTALL_COMMAND nmake install INSTALL_COMMAND nmake install
URL_MD5 3be209000dbc7e1b95bcdf47980a3baa URL_MD5 3be209000dbc7e1b95bcdf47980a3baa
) )
@ -192,8 +184,8 @@ if (TARS_SSL)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
# INSTALL_COMMAND cmake -P ${RUN_SSL_INSTALL_FILE} # INSTALL_COMMAND cmake -P ${RUN_SSL_INSTALL_FILE}
URL_MD5 3be209000dbc7e1b95bcdf47980a3baa URL_MD5 3be209000dbc7e1b95bcdf47980a3baa
) )
@ -224,8 +216,8 @@ if (TARS_MYSQL)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND cmake --build . --config release BUILD_COMMAND cmake --build . --config release
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
INSTALL_COMMAND cmake --build . --config release --target install INSTALL_COMMAND cmake --build . --config release --target install
URL_MD5 62de01beffc48348708c983a585b4dc1 URL_MD5 62de01beffc48348708c983a585b4dc1
) )
@ -242,8 +234,8 @@ if (TARS_MYSQL)
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/mysql-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make mysqlclient BUILD_COMMAND make mysqlclient
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
LOG_BUILD 1 # LOG_BUILD 1
# INSTALL_COMMAND cmake --build . --config release --target install # INSTALL_COMMAND cmake --build . --config release --target install
URL_MD5 98ca2071f9d4c6b73146cc0455f6b914 URL_MD5 98ca2071f9d4c6b73146cc0455f6b914
) )
@ -277,8 +269,8 @@ if (TARS_HTTP2)
CONFIGURE_COMMAND cmake . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/nghttp2 -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=ON CONFIGURE_COMMAND cmake . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/nghttp2 -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=ON
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/nghttp2-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/nghttp2-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
LOG_BUILD 1 # LOG_BUILD 1
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
BUILD_COMMAND cmake --build . --config release BUILD_COMMAND cmake --build . --config release
INSTALL_COMMAND cmake --build . --config release --target install INSTALL_COMMAND cmake --build . --config release --target install
URL_MD5 5df375bbd532fcaa7cd4044b54b1188d URL_MD5 5df375bbd532fcaa7cd4044b54b1188d
@ -293,8 +285,8 @@ if (TARS_HTTP2)
CONFIGURE_COMMAND cmake . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/nghttp2 -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=ON CONFIGURE_COMMAND cmake . -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/nghttp2 -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=ON
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/nghttp2-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/nghttp2-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
LOG_BUILD 1 # LOG_BUILD 1
LOG_CONFIGURE 1 # LOG_CONFIGURE 1
BUILD_COMMAND make BUILD_COMMAND make
# INSTALL_COMMAND incmake --build . --config release --target install # INSTALL_COMMAND incmake --build . --config release --target install
URL_MD5 5df375bbd532fcaa7cd4044b54b1188d URL_MD5 5df375bbd532fcaa7cd4044b54b1188d

@ -1 +1 @@
Subproject commit 504ebee584ac972943a9ffef7b738114300793e4 Subproject commit ed2cb055d5799d45bdeeec920092ee3fccd85e2b

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,14 @@
/* A Bison parser, made by GNU Bison 3.2.2. */ /* A Bison parser, made by GNU Bison 2.3. */
/* Bison interface for Yacc-like parsers in C /* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation; either version 2, or (at your option)
(at your option) any later version. any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -15,7 +16,9 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains /* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work part or all of the Bison parser skeleton and distribute that work
@ -30,68 +33,87 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
/* Undocumented macros, especially those whose name start with YY_, /* Tokens. */
are private implementation details. Do not rely on them. */
#ifndef YY_YY_TARS_TAB_HPP_INCLUDED
# define YY_YY_TARS_TAB_HPP_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
#if YYDEBUG
extern int yydebug;
#endif
/* Token type. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
# define YYTOKENTYPE # define YYTOKENTYPE
enum yytokentype /* Put the tokens into the symbol table, so that GDB and other debuggers
{ know about them. */
TARS_VOID = 258, enum yytokentype {
TARS_STRUCT = 259, TARS_VOID = 258,
TARS_BOOL = 260, TARS_STRUCT = 259,
TARS_BYTE = 261, TARS_BOOL = 260,
TARS_SHORT = 262, TARS_BYTE = 261,
TARS_INT = 263, TARS_SHORT = 262,
TARS_DOUBLE = 264, TARS_INT = 263,
TARS_FLOAT = 265, TARS_DOUBLE = 264,
TARS_LONG = 266, TARS_FLOAT = 265,
TARS_STRING = 267, TARS_LONG = 266,
TARS_VECTOR = 268, TARS_STRING = 267,
TARS_MAP = 269, TARS_VECTOR = 268,
TARS_NAMESPACE = 270, TARS_MAP = 269,
TARS_INTERFACE = 271, TARS_NAMESPACE = 270,
TARS_IDENTIFIER = 272, TARS_INTERFACE = 271,
TARS_OUT = 273, TARS_IDENTIFIER = 272,
TARS_OP = 274, TARS_OUT = 273,
TARS_KEY = 275, TARS_OP = 274,
TARS_ROUTE_KEY = 276, TARS_KEY = 275,
TARS_REQUIRE = 277, TARS_ROUTE_KEY = 276,
TARS_OPTIONAL = 278, TARS_REQUIRE = 277,
TARS_CONST_INTEGER = 279, TARS_OPTIONAL = 278,
TARS_CONST_FLOAT = 280, TARS_CONST_INTEGER = 279,
TARS_FALSE = 281, TARS_CONST_FLOAT = 280,
TARS_TRUE = 282, TARS_FALSE = 281,
TARS_STRING_LITERAL = 283, TARS_TRUE = 282,
TARS_SCOPE_DELIMITER = 284, TARS_STRING_LITERAL = 283,
TARS_CONST = 285, TARS_SCOPE_DELIMITER = 284,
TARS_ENUM = 286, TARS_CONST = 285,
TARS_UNSIGNED = 287, TARS_ENUM = 286,
BAD_CHAR = 288 TARS_UNSIGNED = 287,
}; BAD_CHAR = 288
};
#endif #endif
/* Tokens. */
#define TARS_VOID 258
#define TARS_STRUCT 259
#define TARS_BOOL 260
#define TARS_BYTE 261
#define TARS_SHORT 262
#define TARS_INT 263
#define TARS_DOUBLE 264
#define TARS_FLOAT 265
#define TARS_LONG 266
#define TARS_STRING 267
#define TARS_VECTOR 268
#define TARS_MAP 269
#define TARS_NAMESPACE 270
#define TARS_INTERFACE 271
#define TARS_IDENTIFIER 272
#define TARS_OUT 273
#define TARS_OP 274
#define TARS_KEY 275
#define TARS_ROUTE_KEY 276
#define TARS_REQUIRE 277
#define TARS_OPTIONAL 278
#define TARS_CONST_INTEGER 279
#define TARS_CONST_FLOAT 280
#define TARS_FALSE 281
#define TARS_TRUE 282
#define TARS_STRING_LITERAL 283
#define TARS_SCOPE_DELIMITER 284
#define TARS_CONST 285
#define TARS_ENUM 286
#define TARS_UNSIGNED 287
#define BAD_CHAR 288
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE; typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
extern YYSTYPE yylval; extern YYSTYPE yylval;
int yyparse (void);
#endif /* !YY_YY_TARS_TAB_HPP_INCLUDED */