Changeset 4c18192 in nscp for modules/CheckTaskSched2

Timestamp:

02/20/11 21:59:13 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

01c5d0a

Parents:

1f24a1c

Message:

Tweaked building to work with 32bit as well as 64 (and some minor tweaks to tashschedule2 and psd 6.1)

Location:

modules/CheckTaskSched2

Files:

• CMakeLists.txt (modified) (2 diffs)
• CheckTaskSched2.cpp (modified) (2 diffs)
• CheckTaskSched2.h (modified) (1 diff)
• module.cmake (modified) (1 diff)

modules/CheckTaskSched2/CMakeLists.txt

@@ -28 +28 @@
 )
 
+INCLUDE_DIRECTORIES(${PSDK_61_INCLUDE_DIRS})
+LINK_DIRECTORIES(${PSDK_61_LIBRARY_DIRS})
+
 add_library(${TARGET} MODULE ${SRCS})
 
@@ -37 +40 @@
 
 INCLUDE(${BUILD_CMAKE_FOLDER}/module.cmake)
+#LINK_DIRECTORIES("${NSCP_LINK_DIRECTORIES}")

modules/CheckTaskSched2/CheckTaskSched2.cpp

@@ -50 +50 @@
   return true;
 }
-bool CheckTaskSched::unloadModule() {
+bool CheckTaskSched2::unloadModule() {
   return true;
 }
 
-bool CheckTaskSched::hasCommandHandler() {
+bool CheckTaskSched2::hasCommandHandler() {
   return true;
 }
-bool CheckTaskSched::hasMessageHandler() {
+bool CheckTaskSched2::hasMessageHandler() {
   return false;
 }
@@ -169 +169 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckTaskSched);
+NSC_WRAPPERS_MAIN_DEF(gCheckTaskSched2);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckTaskSched);
+NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckTaskSched2);
 //NSC_WRAPPERS_CLI_DEF(gCheckTaskSched);

modules/CheckTaskSched2/CheckTaskSched2.h

@@ -52 +52 @@
   bool hasMessageHandler();
   NSCAPI::nagiosReturn handleCommand(const strEx::wci_string command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
-  int CheckTaskSched::commandLineExec(const TCHAR* command,const unsigned int argLen,TCHAR** args);
+  int commandLineExec(const TCHAR* command,const unsigned int argLen,TCHAR** args);
 
   // Check commands

modules/CheckTaskSched2/module.cmake

@@ -1 @@
-IF(WIN32)
-SET (BUILD_MODULE 1)
-ENDIF(WIN32)
+IF(WIN32 AND PSDK_61_FOUND)
+  SET (BUILD_MODULE 1)
+ENDIF(WIN32 AND PSDK_61_FOUND)