Changeset d66ccee in nscp for helpers

Timestamp:

04/16/11 12:07:47 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

3bdaf18

Parents:

b7d17f8

Message:

Tweaks to make building faster

Location:

helpers

Files:

• installer-dlls/fw_dll/CMakeLists.txt (deleted)
• installer-dlls/fw_dll/Jamfile (deleted)
• installer-dlls/fw_dll/cost.h (deleted)
• installer-dlls/fw_dll/firewall.cpp (deleted)
• installer-dlls/fw_dll/firewall.rc (deleted)
• installer-dlls/fw_dll/fw_dll.cpp (deleted)
• installer-dlls/fw_dll/fw_dll.def (deleted)
• installer-dlls/fw_dll/module.cmake (deleted)
• installer-dlls/fw_dll/precomp.h (deleted)
• installer-dlls/main_dll/CMakeLists.txt (modified) (3 diffs)
• installer-dlls/main_dll/main_dll.cpp (modified) (1 diff)
• installers/installer/CMakeLists.txt (modified) (1 diff)
• settings_manager/CMakeLists.txt (modified) (2 diffs)

helpers/installer-dlls/main_dll/CMakeLists.txt

@@ -1 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 
 SET(TARGET main_dll)
@@ -21 +21 @@
 ENDIF(WIN32)
 
+if(NOT CMAKE_CL_64)
 INCLUDE_DIRECTORIES(${PSDK_2003_INCLUDE_DIRS})
-#LINK_DIRECTORIES(${PSDK_2003_LIBRARY_DIRS})
-
+LINK_DIRECTORIES(${PSDK_2003_LIBRARY_DIRS})
+ENDIF(NOT CMAKE_CL_64)
 ADD_LIBRARY(${TARGET} MODULE ${SRCS})
 
@@ -35 +36 @@
 
 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "installer-dll")
-
-INSTALL(TARGETS ${TARGET} LIBRARY DESTINATION helpers)

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -386 +386 @@
         std::wstring command = _T("msiexec /uninstall ") + (*cit);
         TCHAR *cmd = new TCHAR[command.length()+1];
-        wcsncpy_s(cmd, command.length()+1, command.c_str(), command.length());
+        wcsncpy(cmd, command.c_str(), command.length());
         cmd[command.length()] = 0;
         PROCESS_INFORMATION pi;

helpers/installers/installer/CMakeLists.txt

@@ -1 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 
 SET(TARGET nsclient_installer)

helpers/settings_manager/CMakeLists.txt

@@ -5 +5 @@
 INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIRS})
 LINK_DIRECTORIES(${BOOST_LIB_DIRS})
-#INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR})
 
 SET(service_SRCS
@@ -41 +40 @@
 add_library (${TARGET} ${service_SRCS})
 
+target_link_libraries(${TARGET} protobuf)
+
 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "core")