builds mssql-vdi

bareos · Dec 20, 2017 · d3fbf2a · d3fbf2a
1 parent a657f41
commit d3fbf2a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/src/plugins/filed/CMakeLists.txt b/src/plugins/filed/CMakeLists.txt
@@ -19,12 +19,19 @@
 
 IF(${HAVE_WIN32})
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/generic
+      ${CMAKE_SOURCE_DIR}/src/win32
+      ${CMAKE_SOURCE_DIR}/src/win32/include
       ${CMAKE_SOURCE_DIR}/src/win32/filed
+      ${CMAKE_SOURCE_DIR}/src/win32/plugins/filed
+      ${CMAKE_SOURCE_DIR}/src/win32/compat/include
+      ${CMAKE_SOURCE_DIR}/src/win32/vdi/include
       ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include
-      ../../include
-      ../../filed
-      ../..)
+      ${CMAKE_SOURCE_DIR}/src/include
+      ${CMAKE_SOURCE_DIR}/src
+      ${CMAKE_SOURCE_DIR}/src/filed
+      ${CMAKE_SOURCE_DIR}/src/plugins/filed
+      )
+
    link_directories(${CMAKE_SOURCE_DIR}/src/win32/plugins/python/lib/64)
    add_definitions(-DMS_WIN64)
 ELSE()
@@ -43,6 +50,18 @@ IF(${HAVE_WIN32})
 ENDIF()
 
 
+IF(${HAVE_WIN32})
+add_library(mssqlvdi-fd MODULE ../../win32/plugins/filed/mssqlvdi-fd.cc)
+target_compile_options(mssqlvdi-fd PUBLIC -fpermissive)
+set_target_properties(mssqlvdi-fd PROPERTIES PREFIX ""
+                                  DEFINE_SYMBOL "BUILDING_DLL"
+   )
+
+INSTALL(TARGETS mssqlvdi-fd DESTINATION ${plugindir})
+target_link_libraries(mssqlvdi-fd bareos)
+ENDIF()
+
+
 if(${HAVE_CEPHFS})
 add_library(cephfs-fd MODULE cephfs-fd.cc)
 set_target_properties(cephfs-fd PROPERTIES PREFIX "")

diff --git a/src/qt-tray-monitor/CMakeLists.txt b/src/qt-tray-monitor/CMakeLists.txt
@@ -20,6 +20,13 @@
 cmake_minimum_required(VERSION 3.0)
 # (for AUTOUIC)
 
+
+
+IF(${HAVE_WIN32})
+  FILE(GLOB QTROOTS /usr/x86_64-w64-mingw32/bin/)
+  FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS ${QTROOTS})
+ENDIF()
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
@@ -28,7 +35,16 @@ set(CMAKE_AUTORCC ON)
 
 find_package(Qt4 REQUIRED)
 
-include_directories(. .. ../include ../lib)
+IF(${HAVE_WIN32})
+   include_directories(
+      ${CMAKE_SOURCE_DIR}/src/win32/include
+      ${CMAKE_SOURCE_DIR}/src/win32/lib
+      ../include ..
+      )
+ELSE()
+   include_directories(. .. ../include ../lib)
+ENDIF()
+
 
 set(SOURCES
    tray-monitor.cpp authenticate.cpp tray_conf.cpp tray-monitor.cpp