Changeset 86632db in nscp
- Timestamp:
- 06/03/10 20:43:53 (3 years ago)
- Branches:
- master, 0.4.0, 0.4.1, 0.4.2
- Children:
- acf0660
- Parents:
- d161020
- Files:
-
- 2 added
- 7 edited
-
CMakeLists.txt (modified) (8 diffs)
-
build.cmake (modified) (1 diff)
-
cmake/SetMultiThread.cmake (added)
-
include/simple_timer.hpp (added)
-
modules/CheckExternalScripts/CMakeLists.txt (modified) (1 diff)
-
modules/NRPEClient/CMakeLists.txt (modified) (2 diffs)
-
modules/NRPEServer/CMakeLists.txt (modified) (2 diffs)
-
modules/NSCAAgent/CMakeLists.txt (modified) (1 diff)
-
service/CMakeLists.txt (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
rcad08fb r86632db 1 1 cmake_minimum_required(VERSION 2.6) 2 3 include(build.cmake)4 2 5 3 PROJECT(NSCP) … … 9 7 SET(VERSION_MINOR 0) 10 8 9 10 INCLUDE(cmake/SetMultiThread.cmake) 11 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### 12 # 13 # Setup section 14 # An option to override this is to set them in the build.cmake file 15 # 16 # ### ### ### ### 17 # Include local build enviornment 18 include(build.cmake) 19 # ### ### ### ### 20 # Generic includes 21 # TODO 22 # ### ### ### ### 23 # NSCP Includes 24 SET(NSCP_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}" CACHE PATH "Generic path to all libraries") 25 SET(NSCP_INCLUDEDIR "${NSCP_SOURCE_DIR}/include" CACHE PATH "Generic include path (for NSCP include files amongst others)") 26 # ### ### ### ### 27 # Boost setup 28 SET(Boost_USE_STATIC_LIBS CACHE BOOL ON "Link boost statically (generally a good idea)") 29 SET(BOOST_INCLUDEDIR "${INC_BOOST_INCLUDEDIR}" CACHE PATH "Path to boost includes") 30 SET(BOOST_LIBRARYDIR "${NSCP_LIBRARYDIR}" CACHE PATH "Path to boost libraries") 31 # ### ### ### ### 32 # Open SSL 33 SET(OPENSSL_INCLUDE_DIR "${INC_OPENSSL_INCLUDEDIR}" CACHE PATH "Path to openssl includes") 34 # ### ### ### ### 35 # Google Protocol buffer 36 SET(PROTOBUF_DIR "${INC_PROTOBUF_DIR}" CACHE PATH "Path to google protocol buffer root") 37 IF(WIN32 AND MSVC) 38 SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src" CACHE PATH "Path to google protocol buffer source") 39 SET(PROTOBUF_LIBRARYDIR "${PROTOBUF_DIR}/vsprojects/Debug") 40 SET(PROTOBUF_BINARYDIR "${PROTOBUF_DIR}/vsprojects/Debug") 41 ELSE(WIN32 AND MSVC) 42 # TODO 43 ENDIF(WIN32 AND MSVC) 44 # ### ### ### ### 45 # Crypto++ 46 SET(CRYPTOPP_DIR "${INC_CRYPTOPP_DIR}" CACHE PATH "Path to crypto++ root folder") 47 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### 11 48 12 49 IF(APPLE) … … 23 60 ELSEIF(WIN32) 24 61 IF(NOT MSVC) 25 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")62 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32") 26 63 ENDIF(NOT MSVC) 27 64 ENDIF(APPLE) 28 65 29 66 SET_MULTITHREAD() 30 67 31 68 IF(NOT SHARED_LIBS) … … 45 82 ENDIF(NOT MULTI_THREADED) 46 83 47 SET(NSCP_INCLUDE_PATH "${NSCP_SOURCE_DIR}/include" CACHE PATH "directory containing NSCP specific includes") 48 #SET(PB_PATH "${NSCP_SOURCE_DIR}/proto" CACHE PATH "directory containing NSCP specific protocol buffer files") 49 INCLUDE_DIRECTORIES(${NSCP_INCLUDE_PATH}) 50 #INCLUDE_DIRECTORIES(${PB_PATH}) 51 52 SET(BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR} CACHE PATH "") 53 SET(BOOST_INCLUDEDIR ${BOOST_INCLUDEDIR} CACHE PATH "") 54 SET(BOOST_LIB_SUFFIX ${BOOST_LIB_SUFFIX} CACHE STRING "Look for Boost libraries ending with this") 84 INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR}) 85 SET(CMAKE_LIBRARY_PATH "${NSCP_LIBRARYDIR}" CACHE PATH "Path to generic libraries") 86 #SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE PATH "Look for libraries here") 55 87 56 88 IF(WIN32) … … 71 103 ENDIF(WIN32) 72 104 73 SET(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR} CACHE PATH "Look for OPENSSL headers here")74 SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE PATH "Look for libraries here")75 105 76 106 FIND_PACKAGE(OpenSSL) … … 167 197 168 198 SET(NSCP_DEF_PLUGIN_CPP 169 ${NSCP_INCLUDE _PATH}/arrayBuffer.cpp170 ${NSCP_INCLUDE _PATH}/simpleini/ConvertUTF.c171 ${NSCP_INCLUDE _PATH}/b64/b64.c172 ${NSCP_INCLUDE _PATH}/utils.cpp173 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_helper.cpp174 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_plugin_wrapper.cpp175 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_core_wrapper.cpp199 ${NSCP_INCLUDEDIR}/arrayBuffer.cpp 200 ${NSCP_INCLUDEDIR}/simpleini/ConvertUTF.c 201 ${NSCP_INCLUDEDIR}/b64/b64.c 202 ${NSCP_INCLUDEDIR}/utils.cpp 203 ${NSCP_INCLUDEDIR}/nscapi/nscapi_helper.cpp 204 ${NSCP_INCLUDEDIR}/nscapi/nscapi_plugin_wrapper.cpp 205 ${NSCP_INCLUDEDIR}/nscapi/nscapi_core_wrapper.cpp 176 206 ) 177 207 178 208 SET(NSCP_DEF_PLUGIN_HPP 179 ${NSCP_INCLUDE _PATH}/strEx.h180 ${NSCP_INCLUDE _PATH}/config.h181 ${NSCP_INCLUDE _PATH}/utils.h182 ${NSCP_INCLUDE _PATH}/NSCAPI.h183 ${NSCP_INCLUDE _PATH}/nscapi/macros.hpp184 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_helper.hpp185 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_plugin_wrapper.hpp186 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_core_wrapper.hpp209 ${NSCP_INCLUDEDIR}/strEx.h 210 ${NSCP_INCLUDEDIR}/config.h 211 ${NSCP_INCLUDEDIR}/utils.h 212 ${NSCP_INCLUDEDIR}/NSCAPI.h 213 ${NSCP_INCLUDEDIR}/nscapi/macros.hpp 214 ${NSCP_INCLUDEDIR}/nscapi/nscapi_helper.hpp 215 ${NSCP_INCLUDEDIR}/nscapi/nscapi_plugin_wrapper.hpp 216 ${NSCP_INCLUDEDIR}/nscapi/nscapi_core_wrapper.hpp 187 217 ) 188 218 … … 194 224 protobuf 195 225 ) 196 message(STATUS, "LIB: ${NSCP_DEF_PLUGIN_LIB}") 226 message(STATUS, "NSCP PLUGIN LIB: ${NSCP_DEF_PLUGIN_LIB}") 227 message(STATUS, "NSCP PLUGIN CPP: ${NSCP_DEF_PLUGIN_CPP}") 197 228 198 229 … … 210 241 # Compile time constants & make sure our build finds it 211 242 CONFIGURE_FILE( 212 ${NSCP_INCLUDE _PATH}/config.h.in213 ${NSCP_INCLUDE _PATH}/config.h243 ${NSCP_INCLUDEDIR}/config.h.in 244 ${NSCP_INCLUDEDIR}/config.h 214 245 ) 215 246 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -
build.cmake
rb0e7ecf r86632db 5 5 set(Boost_USE_STATIC_LIBS ON) 6 6 set(BOOST_USE_MULTITHREADED ON) 7 8 SET(BOOST_INCLUDEDIR D:/source/include/)9 SET(BOOST_LIBRARYDIR D:/source/lib/x86)10 7 #SET(BOOST_LIB_SUFFIX vc80-mt) 11 8 #SET(Boost_VERSION 1.40) 12 9 13 14 SET(OPENSSL_INCLUDE_DIR D:/source/include/) 15 SET(CMAKE_LIBRARY_PATH D:/source/lib/x86/) 16 17 SET(PROTOBUF_INCLUDE_DIR D:/source/protobuf-2.3.0/src) 18 SET(PROTOBUF_LIBRARYDIR D:/source/protobuf-2.3.0/vsprojects/Debug) 19 SET(PROTOBUF_BINARYDIR D:/source/protobuf-2.3.0/vsprojects/Debug) 20 21 #SET(PROTOBUF_LIBRARYDIR C:/src/protobuf-2.3.0/vsprojects/Release) 22 #SET(PROTOBUF_BINARYDIR C:/src/protobuf-2.3.0/vsprojects/Release) 10 SET(INC_BOOST_INCLUDEDIR C:/source/include) 11 SET(INC_BOOST_LIBRARYDIR C:/source/lib/x64) 23 12 24 13 25 SET(CRYPTOPP_DIR C:/src/lib-src/Crypto++5.6.0) 14 SET(INC_OPENSSL_INCLUDEDIR C:/source/include) 15 SET(INC_NSCP_LIBRARYDIR C:/source/lib/x64) 26 16 27 SET(CRYPTOPP_SOURCE d:/source/libs-c/crypto++-5.6.0) 17 SET(INC_PROTOBUF_DIR "c:/source/libraries/protobuf-2.3.0") 18 SET(INC_CRYPTOPP_DIR "c:/source/libraries/cryptopp-5.6.0") 28 19 29 20 ELSE(WIN32) 30 21 31 22 ENDIF(WIN32) 32 SET(CRYPTOPP_SOURCE d:/source/libs-c/crypto++-5.6.0) 23 -
modules/CheckExternalScripts/CMakeLists.txt
r3080680 r86632db 19 19 "${TARGET}.def" 20 20 21 ${NSCP_INCLUDE _PATH}/execute_process_unix.hpp22 ${NSCP_INCLUDE _PATH}/execute_process_w32.hpp21 ${NSCP_INCLUDEDIR}/execute_process_unix.hpp 22 ${NSCP_INCLUDEDIR}/execute_process_w32.hpp 23 23 24 24 ${NSCP_DEF_PLUGIN_HPP} -
modules/NRPEClient/CMakeLists.txt
r40970de r86632db 8 8 stdafx.cpp 9 9 "${TARGET}.cpp" 10 ${NSCP_INCLUDE _PATH}/nrpe/nrpe_packet.cpp10 ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.cpp 11 11 12 12 ${NSCP_DEF_PLUGIN_CPP} … … 20 20 "${TARGET}.h" 21 21 "${TARGET}.def" 22 ${NSCP_INCLUDE _PATH}/socket_helpers.hpp23 ${NSCP_INCLUDE _PATH}/nrpe/nrpe_packet.hpp24 ${NSCP_INCLUDE _PATH}/nrpe/nrpe_socket.hpp25 ${NSCP_INCLUDE _PATH}/swap_bytes.hpp22 ${NSCP_INCLUDEDIR}/socket_helpers.hpp 23 ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.hpp 24 ${NSCP_INCLUDEDIR}/nrpe/nrpe_socket.hpp 25 ${NSCP_INCLUDEDIR}/swap_bytes.hpp 26 26 27 27 ${NSCP_DEF_PLUGIN_HPP} -
modules/NRPEServer/CMakeLists.txt
r40970de r86632db 14 14 nrpe_connection.cpp 15 15 nrpe_handler.cpp 16 ${NSCP_INCLUDE _PATH}/nrpe/nrpe_packet.cpp16 ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.cpp 17 17 18 18 ${NSCP_DEF_PLUGIN_CPP} … … 30 30 nrpe_handler.hpp 31 31 nrpe_parser.hpp 32 ${NSCP_INCLUDE _PATH}/socket_helpers.hpp33 ${NSCP_INCLUDE _PATH}/nrpe/nrpe_packet.hpp34 ${NSCP_INCLUDE _PATH}/swap_bytes.hpp32 ${NSCP_INCLUDEDIR}/socket_helpers.hpp 33 ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.hpp 34 ${NSCP_INCLUDEDIR}/swap_bytes.hpp 35 35 36 36 ${NSCP_DEF_PLUGIN_HPP} -
modules/NSCAAgent/CMakeLists.txt
r47bcf6f r86632db 27 27 "${TARGET}.h" 28 28 "${TARGET}.def" 29 ${NSCP_INCLUDE _PATH}/nsca/nsca_packet.hpp30 ${NSCP_INCLUDE _PATH}/nsca/nsca_socket.hpp31 ${NSCP_INCLUDE _PATH}/nsca/nsca_enrypt.hpp32 ${NSCP_INCLUDE _PATH}/swap_bytes.hpp29 ${NSCP_INCLUDEDIR}/nsca/nsca_packet.hpp 30 ${NSCP_INCLUDEDIR}/nsca/nsca_socket.hpp 31 ${NSCP_INCLUDEDIR}/nsca/nsca_enrypt.hpp 32 ${NSCP_INCLUDEDIR}/swap_bytes.hpp 33 33 34 34 ${NSCP_DEF_PLUGIN_HPP} -
service/CMakeLists.txt
rcad08fb r86632db 4 4 INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIRS}) 5 5 LINK_DIRECTORIES(${BOOST_LIB_DIRS}) 6 #INCLUDE_DIRECTORIES(${NSCP_INCLUDE _PATH})6 #INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR}) 7 7 8 8 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES}) … … 19 19 settings_manager_impl.cpp 20 20 21 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_helper.cpp21 ${NSCP_INCLUDEDIR}/nscapi/nscapi_helper.cpp 22 22 23 ${NSCP_INCLUDE _PATH}/simpleini/ConvertUTF.c24 ${NSCP_INCLUDE _PATH}/b64/b64.c25 ${NSCP_INCLUDE _PATH}/arrayBuffer.cpp23 ${NSCP_INCLUDEDIR}/simpleini/ConvertUTF.c 24 ${NSCP_INCLUDEDIR}/b64/b64.c 25 ${NSCP_INCLUDEDIR}/arrayBuffer.cpp 26 26 27 27 ) … … 29 29 IF(WIN32) 30 30 SET(service_SRCS ${service_SRCS} 31 ${NSCP_INCLUDE _PATH}/ServiceCmd.cpp31 ${NSCP_INCLUDEDIR}/ServiceCmd.cpp 32 32 ) 33 33 SET(service_SRCS ${service_SRCS} … … 46 46 service_manager.hpp 47 47 48 ${NSCP_INCLUDE _PATH}/settings/Settings.h49 ${NSCP_INCLUDE _PATH}/charEx.h50 ${NSCP_INCLUDE _PATH}/config.h51 ${NSCP_INCLUDE _PATH}/msvc_wrappers.h52 ${NSCP_INCLUDE _PATH}/settings/macros.h53 ${NSCP_INCLUDE _PATH}/settings/settings_ini.hpp54 ${NSCP_INCLUDE _PATH}/settings/settings_old.hpp55 ${NSCP_INCLUDE _PATH}/settings/settings_registry.hpp56 ${NSCP_INCLUDE _PATH}/settings/Settings.h57 ${NSCP_INCLUDE _PATH}/com_helpers.hpp58 ${NSCP_INCLUDE _PATH}/dll/dll.hpp59 ${NSCP_INCLUDE _PATH}/dll/impl_unix.hpp60 ${NSCP_INCLUDE _PATH}/dll/impl_w32.hpp61 # ${NSCP_INCLUDE _PATH}/nsclient_session.hpp48 ${NSCP_INCLUDEDIR}/settings/Settings.h 49 ${NSCP_INCLUDEDIR}/charEx.h 50 ${NSCP_INCLUDEDIR}/config.h 51 ${NSCP_INCLUDEDIR}/msvc_wrappers.h 52 ${NSCP_INCLUDEDIR}/settings/macros.h 53 ${NSCP_INCLUDEDIR}/settings/settings_ini.hpp 54 ${NSCP_INCLUDEDIR}/settings/settings_old.hpp 55 ${NSCP_INCLUDEDIR}/settings/settings_registry.hpp 56 ${NSCP_INCLUDEDIR}/settings/Settings.h 57 ${NSCP_INCLUDEDIR}/com_helpers.hpp 58 ${NSCP_INCLUDEDIR}/dll/dll.hpp 59 ${NSCP_INCLUDEDIR}/dll/impl_unix.hpp 60 ${NSCP_INCLUDEDIR}/dll/impl_w32.hpp 61 # ${NSCP_INCLUDEDIR}/nsclient_session.hpp 62 62 63 ${NSCP_INCLUDE _PATH}/service/system_service.hpp64 ${NSCP_INCLUDE _PATH}/service/win32_service.hpp65 ${NSCP_INCLUDE _PATH}/nscapi/nscapi_helper.hpp63 ${NSCP_INCLUDEDIR}/service/system_service.hpp 64 ${NSCP_INCLUDEDIR}/service/win32_service.hpp 65 ${NSCP_INCLUDEDIR}/nscapi/nscapi_helper.hpp 66 66 67 67 ) 68 68 SET(service_SRCS ${service_SRCS} 69 ${NSCP_INCLUDE _PATH}/service/unix_service.hpp69 ${NSCP_INCLUDEDIR}/service/unix_service.hpp 70 70 ) 71 71
Note: See TracChangeset
for help on using the changeset viewer.
