Changeset 04ef932 in nscp for tools


Ignore:
Timestamp:
08/10/11 07:37:24 (22 months ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
54ac968
Parents:
e11d494
Message:

2011-08-10

  • Fixed so it builds and runs on linux (but parser had issues so disabled som grammar rules whichneeds to be enabled again)
  • Added a lot of freatures and cleand up the PythonScript module
  • Started to merge som features from PythonScript back to Lua script


2011-08-07

  • Fixed a lot of issues with PythonScript module adding suport for alias and "raw command processing"
  • Fixed issue with loading plugins and aliases as well as duplicate plugin detection


2011-08-01

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/error_reporter/CMakeLists.txt

    rd66ccee r04ef932  
    33SET(TARGET reporter) 
    44 
    5 PROJECT(reporter) 
     5IF(BREAKPAD_FOUND) 
     6  PROJECT(reporter) 
    67 
    7 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES}) 
     8  ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES}) 
    89 
    9 SET(reporter_SRCS 
    10   StdAfx.cpp 
    11   reporter.cpp 
    12 ) 
     10  SET(reporter_SRCS 
     11    StdAfx.cpp 
     12    reporter.cpp 
     13  ) 
    1314 
    14 IF(WIN32) 
    15   SET(reporter_SRCS ${reporter_SRCS} 
    16     ${NSCP_INCLUDEDIR}/ServiceCmd.cpp 
    17      
    18 # /breakpad//common 
    19 # /breakpad//crash_report_sender 
     15  IF(WIN32) 
     16    SET(reporter_SRCS ${reporter_SRCS} 
     17      ${NSCP_INCLUDEDIR}/ServiceCmd.cpp 
     18       
     19  # /breakpad//common 
     20  # /breakpad//crash_report_sender 
    2021 
    21     reporter.h 
    22     StdAfx.h 
     22      reporter.h 
     23      StdAfx.h 
     24    ) 
     25    SET(EXTRA_LIBS Wininet.lib) 
     26  ENDIF(WIN32) 
     27 
     28  add_executable (${TARGET} ${reporter_SRCS}) 
     29  target_link_libraries(${TARGET} 
     30    ${Boost_FILESYSTEM_LIBRARY} 
     31    ${Boost_SYSTEM_LIBRARY} 
     32  # ${NSCP_DEF_PLUGIN_LIB} 
     33    ${BREAKPAD_COMMON_LIBRARY} 
     34    ${BREAKPAD_CRASH_REPORT_SENDER_LIBRARY} 
     35    ${EXTRA_LIBS} 
    2336  ) 
    24   SET(EXTRA_LIBS Wininet.lib) 
    25 ENDIF(WIN32) 
     37  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "tools") 
    2638 
    27 add_executable (${TARGET} ${reporter_SRCS}) 
    28 target_link_libraries(${TARGET} 
    29   ${Boost_FILESYSTEM_LIBRARY} 
    30   ${Boost_SYSTEM_LIBRARY} 
    31 # ${NSCP_DEF_PLUGIN_LIB} 
    32   ${BREAKPAD_COMMON_LIBRARY} 
    33   ${BREAKPAD_CRASH_REPORT_SENDER_LIBRARY} 
    34   ${EXTRA_LIBS} 
    35 ) 
    36 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "tools") 
     39  SOURCE_GROUP("Common Files" REGULAR_EXPRESSION .*include/.*) 
     40  SOURCE_GROUP("Parser" REGULAR_EXPRESSION .*include/parser/.*) 
     41  SOURCE_GROUP("NSCP API" REGULAR_EXPRESSION .*include/nscapi/.*) 
     42  SOURCE_GROUP("Settings" REGULAR_EXPRESSION .*include/settings/.*) 
    3743 
    38 SOURCE_GROUP("Common Files" REGULAR_EXPRESSION .*include/.*) 
    39 SOURCE_GROUP("Parser" REGULAR_EXPRESSION .*include/parser/.*) 
    40 SOURCE_GROUP("NSCP API" REGULAR_EXPRESSION .*include/nscapi/.*) 
    41 SOURCE_GROUP("Settings" REGULAR_EXPRESSION .*include/settings/.*) 
    42  
    43 INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION .) 
    44 INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_EXE_PATH}/${TARGET}.pdb)") 
    45 INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX} TYPE EXECUTABLE FILES \${PDB_FULL_PATH})") 
     44  INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION .) 
     45  INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_EXE_PATH}/${TARGET}.pdb)") 
     46  INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX} TYPE EXECUTABLE FILES \${PDB_FULL_PATH})") 
     47ENDIF(BREAKPAD_FOUND) 
Note: See TracChangeset for help on using the changeset viewer.