Changeset 4c18192 in nscp

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)

Files:

• CMakeLists.txt (modified) (5 diffs)
• build.cmake (modified) (2 diffs)
• libs/protobuf/log.proto.h (modified) (1 diff)
• modules/CheckTaskSched/module.cmake (modified) (1 diff)
• modules/CheckTaskSched2/CMakeLists.txt (modified) (2 diffs)
• modules/CheckTaskSched2/CheckTaskSched2.cpp (modified) (2 diffs)
• modules/CheckTaskSched2/CheckTaskSched2.h (modified) (1 diff)
• modules/CheckTaskSched2/module.cmake (modified) (1 diff)

CMakeLists.txt

@@ -1 +1 @@
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS On)
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.0)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build/cmake;${CMAKE_MODULE_PATH}")
   
-PROJECT(NSCP)
+PROJECT(NSCP CXX C)
 
 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
@@ -179 +179 @@
 endif(Boost_FOUND)
 
-LINK_DIRECTORIES("${CMAKE_LIBRARY_PATH};${OPENSSL_LIBRARY_DIR};${NSCP_LIBRARYDIR};${BOOST_LIBRARYDIR}")
-
 if(PROTOBUF_FOUND)
   message(STATUS "Found proto in: ${PROTOBUF_LIBRARY} (${PROTOBUF_PROTOC_EXECUTABLE})")
@@ -187 +185 @@
   message(FATAL_ERROR, "Protocol buffers NOT found (${PROTOBUF_LIBRARYDIR}, )")
 endif(PROTOBUF_FOUND)
+
+IF(WIN32)
+  FIND_PATH(PSDK_61_INCLUDE_DIRS Windows.h
+    ${INC_PSDK_61}
+    ${INC_PSDK_61}/include
+    "C:/Program Files/Microsoft SDKs/Windows/v6.1/include"
+  )
+
+  if(CMAKE_SIZEOF_VOID_P MATCHES 4)
+    FIND_PATH(PSDK_61_LIBRARY_DIRS WS2_32.Lib
+      ${INC_PSDK_61}/lib
+      "C:/Program Files/Microsoft SDKs/Windows/v6.1/lib"
+    )
+  else()
+    FIND_PATH(PSDK_61_LIBRARY_DIRS WSock32.Lib
+      ${INC_PSDK_61}/lib/x64
+      "C:/Program Files/Microsoft SDKs/Windows/v6.1/lib/x64"
+    )
+  endif()
+  if(PSDK_61_INCLUDE_DIRS AND PSDK_61_LIBRARY_DIRS)
+    SET(PSDK_61_FOUND TRUE)
+    message(STATUS "Found PSDK 6.1 (${CMAKE_SIZEOF_VOID_P}): ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})")
+  else()
+    SET(PSDK_61_FOUND FALSE)
+    message(STATUS "PSDK 6.1 NOT FOUND(${CMAKE_SIZEOF_VOID_P}): ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})")
+  endif()
+endif(WIN32)
 
 #IF(NOT WIN32)
@@ -304 +329 @@
 message(STATUS "NSCP PLUGIN CPP: ${NSCP_DEF_PLUGIN_CPP}")
   
+LINK_DIRECTORIES(${CMAKE_LIBRARY_PATH} ${OPENSSL_LIBRARY_DIR} ${NSCP_LIBRARYDIR} ${BOOST_LIBRARYDIR})
+
 SET(ALL_LIB_NAMES)
 message(STATUS "Adding libraries")
@@ -389 +416 @@
   ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-

build.cmake

@@ -1 +1 @@
 IF(WIN32)
-
-  #SET(Boost_DEBUG 1)
   set(Boost_USE_STATIC_LIBS   ON)
   set(Boost_USE_STATIC_RUNTIME  ON)
   set(BOOST_USE_MULTITHREADED   ON)
   SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DBOOST_ALL_NO_LIB)  # THis is used to disable "automatic linking on windows which seems to break since I dont know how to set link dir
+  SET(INC_NSCP_INCLUDEDIR D:/source/include)
+  SET(INC_PSDK_61 "C:/Program Files/Microsoft SDKs/Windows/v6.1/")
 
-  SET(INC_NSCP_LIBRARYDIR D:/source/lib/x64)
-  SET(INC_NSCP_INCLUDEDIR D:/source/include)
+  if(CMAKE_CL_64)
+    MESSAGE(STATUS "Detected x64")
+    SET(INC_NSCP_LIBRARYDIR D:/source/lib/x64)  
+  ELSE()
+    MESSAGE(STATUS "Detected w32")
+    SET(INC_NSCP_LIBRARYDIR D:/source/lib/x86)
+  ENDIF()
 
+  SET(INC_GOOGLE_BREAKPAD_DIR "D:/source/google-breakpad-svn")
+    
   SET(INC_BOOST_INCLUDEDIR "${INC_NSCP_INCLUDEDIR}")
   SET(INC_BOOST_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
@@ -21 +28 @@
 
   SET(INC_LUA_DIR "D:/source/libraries/lua-5.1.4")
-  
-  SET(INC_GOOGLE_BREAKPAD_DIR "D:/source/google-breakpad-svn")
 
 ELSE(WIN32)

libs/protobuf/log.proto.h

@@ -1 +1 @@
 #pragma once
 
-#include "D:/source/nscp/build/libs/protobuf/log.pb.h"
+#include "D:/source/nscp/build-w32/libs/protobuf/log.pb.h"
 

modules/CheckTaskSched/module.cmake

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

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)