SGJP / Morfeusz

Commit a15d02bb4aa5790fffa7e7e050d42f15e0a8cb3d

Authored by Michał Lenart
1 parent d5d8b1a3

- dodanie opcji CMAKE_BUILD_TYPE jako ustawialnej z linii poleceń 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@317 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 3 changed files with 62 additions and 13 deletions
CMakeLists.txt
  View file @a15d02b
... ... @@ -22,7 +22,10 @@ elseif (INPUT_DICTIONARIES)
22 22 elseif (NOT SKIP_DICTIONARY_BUILDING)
23 23 message (WARNING "Will build WITHOUT DICTIONARY. Set INPUT_DICTIONARIES option to build with dictionary.")
24 24 endif ()
25   -set (CMAKE_BUILD_TYPE Debug)
  25 +
  26 +if (NOT CMAKE_BUILD_TYPE)
  27 + set (CMAKE_BUILD_TYPE Release)
  28 +endif ()
26 29 #~ set (CMAKE_SKIP_RPATH ON)
27 30  
28 31 message ("Version=${Morfeusz_VERSION}")
... ... @@ -126,7 +129,7 @@ endif ()
126 129 ### Compilation and linking flags
127 130  
128 131 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
129   - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -pedantic -Wcast-align -Wextra -Wmissing-noreturn -Wconversion -Wcast-qual -Wcast-align")
  132 + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -pedantic -Wcast-align -Wextra -Wmissing-noreturn -Wconversion -Wcast-qual -Wcast-align -Wno-write-strings")
130 133 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND CMAKE_CROSSCOMPILING)
131 134 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -O2")
132 135 set (CMAKE_SHARED_LIBRARY_PREFIX "")
... ...
... ... @@ -105,6 +105,9 @@ Customizing build process
105 105  
106 106 Optional CMake variables:
107 107  
  108 +CMAKE_BUILD_TYPE - manually set build type (possible values Debug, Release, RelWithDebInfo and MinSizeRel).
  109 +Set to Debug if you want to include debugging symbols.
  110 +
108 111 INPUT_TAGSET - tagset file
109 112 SEGMENT_RULES_FILE - segmentation rules file
110 113  
... ...
nbproject/configurations.xml
  View file @a15d02b
... ... @@ -302,16 +302,23 @@
302 302 flavor2="8">
303 303 <ccTool>
304 304 <incDir>
  305 + <pElem>build</pElem>
  306 + <pElem>morfeusz</pElem>
  307 + <pElem>build/morfeusz</pElem>
  308 + <pElem>build/fsa</pElem>
305 309 <pElem>/usr/lib/jvm/default-java/include</pElem>
306 310 <pElem>build/morfeusz/java</pElem>
307 311 </incDir>
308 312 <preprocessorList>
  313 + <Elem>NDEBUG</Elem>
  314 + <Elem>_OPTIMIZE__=1</Elem>
309 315 <Elem>__PIC__=2</Elem>
310 316 <Elem>__pic__=2</Elem>
311 317 <Elem>jmorfeusz_EXPORTS</Elem>
312 318 </preprocessorList>
313 319 <undefinedList>
314 320 <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>
  321 + <Elem>__NO_INLINE__</Elem>
315 322 </undefinedList>
316 323 </ccTool>
317 324 </item>
... ... @@ -321,12 +328,21 @@
321 328 flavor2="4">
322 329 <ccTool flags="1">
323 330 <incDir>
  331 + <pElem>build</pElem>
  332 + <pElem>morfeusz</pElem>
  333 + <pElem>build/morfeusz</pElem>
  334 + <pElem>build/fsa</pElem>
324 335 <pElem>/usr/lib/perl/5.14/CORE</pElem>
325 336 <pElem>build/morfeusz/perl</pElem>
326 337 </incDir>
327 338 <preprocessorList>
  339 + <Elem>NDEBUG</Elem>
  340 + <Elem>_OPTIMIZE__=1</Elem>
328 341 <Elem>morfeusz_perl_EXPORTS</Elem>
329 342 </preprocessorList>
  343 + <undefinedList>
  344 + <Elem>__NO_INLINE__</Elem>
  345 + </undefinedList>
330 346 </ccTool>
331 347 </item>
332 348 <item path="build/morfeusz/morfeuszPYTHON_wrap.cxx"
... ... @@ -335,16 +351,23 @@
335 351 flavor2="8">
336 352 <ccTool>
337 353 <incDir>
  354 + <pElem>build</pElem>
  355 + <pElem>morfeusz</pElem>
  356 + <pElem>build/morfeusz</pElem>
  357 + <pElem>build/fsa</pElem>
338 358 <pElem>/usr/include/python2.7</pElem>
339 359 <pElem>build/morfeusz/python</pElem>
340 360 </incDir>
341 361 <preprocessorList>
  362 + <Elem>NDEBUG</Elem>
  363 + <Elem>_OPTIMIZE__=1</Elem>
342 364 <Elem>__PIC__=2</Elem>
343 365 <Elem>__pic__=2</Elem>
344 366 <Elem>_morfeusz_EXPORTS</Elem>
345 367 </preprocessorList>
346 368 <undefinedList>
347 369 <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>
  370 + <Elem>__NO_INLINE__</Elem>
348 371 </undefinedList>
349 372 </ccTool>
350 373 </item>
... ... @@ -393,15 +416,37 @@
393 416 <item path="default_fsa.cpp" ex="false" tool="1" flavor2="4">
394 417 <ccTool>
395 418 <incDir>
  419 + <pElem>build</pElem>
  420 + <pElem>morfeusz</pElem>
  421 + <pElem>build/morfeusz</pElem>
  422 + <pElem>build/fsa</pElem>
396 423 <pElem>morfeusz/build/morfeusz</pElem>
397 424 </incDir>
  425 + <preprocessorList>
  426 + <Elem>NDEBUG</Elem>
  427 + <Elem>_OPTIMIZE__=1</Elem>
  428 + </preprocessorList>
  429 + <undefinedList>
  430 + <Elem>__NO_INLINE__</Elem>
  431 + </undefinedList>
398 432 </ccTool>
399 433 </item>
400 434 <item path="default_synth_fsa.cpp" ex="false" tool="1" flavor2="4">
401 435 <ccTool>
402 436 <incDir>
  437 + <pElem>build</pElem>
  438 + <pElem>morfeusz</pElem>
  439 + <pElem>build/morfeusz</pElem>
  440 + <pElem>build/fsa</pElem>
403 441 <pElem>morfeusz/build/morfeusz</pElem>
404 442 </incDir>
  443 + <preprocessorList>
  444 + <Elem>NDEBUG</Elem>
  445 + <Elem>_OPTIMIZE__=1</Elem>
  446 + </preprocessorList>
  447 + <undefinedList>
  448 + <Elem>__NO_INLINE__</Elem>
  449 + </undefinedList>
405 450 </ccTool>
406 451 </item>
407 452 <folder path="0/c_api">
... ... @@ -706,30 +751,28 @@
706 751 </folder>
707 752 <folder path="morfeusz">
708 753 <ccTool>
709   - <incDir>
710   - <pElem>build</pElem>
711   - <pElem>morfeusz</pElem>
712   - <pElem>build/morfeusz</pElem>
713   - <pElem>build/fsa</pElem>
714   - </incDir>
715 754 <preprocessorList>
716   - <Elem>NDEBUG</Elem>
717   - <Elem>_OPTIMIZE__=1</Elem>
718 755 <Elem>libmorfeusz_EXPORTS</Elem>
719 756 </preprocessorList>
720   - <undefinedList>
721   - <Elem>__NO_INLINE__</Elem>
722   - </undefinedList>
723 757 </ccTool>
724 758 </folder>
725 759 <folder path="morfeusz/java">
726 760 <ccTool>
727 761 <incDir>
  762 + <pElem>build</pElem>
  763 + <pElem>morfeusz</pElem>
  764 + <pElem>build/morfeusz</pElem>
  765 + <pElem>build/fsa</pElem>
728 766 <pElem>/usr/lib/jvm/default-java/include</pElem>
729 767 </incDir>
730 768 <preprocessorList>
  769 + <Elem>NDEBUG</Elem>
  770 + <Elem>_OPTIMIZE__=1</Elem>
731 771 <Elem>libjmorfeusz_EXPORTS</Elem>
732 772 </preprocessorList>
  773 + <undefinedList>
  774 + <Elem>__NO_INLINE__</Elem>
  775 + </undefinedList>
733 776 </ccTool>
734 777 </folder>
735 778 <folder path="morfeusz/python">
... ...