PYTHON libraries missing for linking.
lineno not renamed in scanner.
This commit is contained in:
parent
8e0bd6d4b9
commit
7abcd87d96
|
@ -1,7 +1,7 @@
|
|||
INCLUDE_DIRECTORIES ( ${VLSISAPD_SOURCE_DIR}/src/liberty/src )
|
||||
ADD_EXECUTABLE ( driveLiberty driveLiberty.cpp )
|
||||
ADD_EXECUTABLE ( parseLiberty parseLiberty.cpp )
|
||||
TARGET_LINK_LIBRARIES ( driveLiberty liberty )
|
||||
TARGET_LINK_LIBRARIES ( parseLiberty liberty )
|
||||
TARGET_LINK_LIBRARIES ( driveLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES ( parseLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
|
||||
INSTALL ( TARGETS driveLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )
|
||||
INSTALL ( TARGETS parseLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )
|
||||
|
|
|
@ -24,7 +24,7 @@ IF(Boost_FOUND)
|
|||
OUTPUT_NAME "AGDS"
|
||||
PREFIX ""
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES(pyAGDS agds ${PYTHON_LIBRARIES})
|
||||
INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES})
|
||||
ENDIF(Boost_FOUND)
|
||||
|
||||
|
|
|
@ -9,7 +9,13 @@
|
|||
static double floatToken;
|
||||
static std::string nameToken;
|
||||
|
||||
extern int yylineno;
|
||||
#ifndef FLEX_BETA
|
||||
int Liberty_lineno = 1;
|
||||
#else
|
||||
extern int Liberty_lineno;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
%}
|
||||
|
||||
|
@ -58,14 +64,14 @@ STRING_FF [\"]?{UPPER_CASE_LETTER}+[\"]?,[\"]?{UPPER_CASE_LETTER}+[\"]
|
|||
%%
|
||||
|
||||
{SPACE} { /* spaces : skip them */ }
|
||||
\n { yylineno++; /* end of line */ }
|
||||
\n { Liberty_lineno++; /* end of line */ }
|
||||
|
||||
<INITIAL>[ \t]+
|
||||
<INITIAL>"/*" { BEGIN(COMM); }
|
||||
<COMM>.
|
||||
<COMM>"*/" { BEGIN(INITIAL); }
|
||||
<INITIAL,COMM>\n { yylineno++; }
|
||||
<INITIAL,COMM>\\\n { yylineno++; }
|
||||
<INITIAL,COMM>\n { Liberty_lineno++; }
|
||||
<INITIAL,COMM>\\\n { Liberty_lineno++; }
|
||||
|
||||
library { return LIBRARY; }
|
||||
|
||||
|
|
Loading…
Reference in New Issue