change ->HAVE_WIN32 everywhere

CMakeLists.txt

@@ -455,7 +455,7 @@ endif()
 
 
 
-if (NOT ${HAVE_WIN32})
+if (NOT HAVE_WIN32)
    if (${ndmp})
       set(HAVE_NDMP 1)
       set(NDMP_LIBS bareosndmp)

platforms/CMakeLists.txt

@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 IF(NOT client-only)
-   IF(NOT ${HAVE_WIN32})
+   IF(NOT HAVE_WIN32)
 
       MESSAGE( STATUS "UNITDIR: " ${UNITDIR} )
       MESSAGE( STATUS "DISTNAME: " ${DISTNAME} )

src/console/CMakeLists.txt

@@ -23,7 +23,7 @@ add_executable(bconsole console.cc console_conf.cc)
 
 set(CONSOLE_LINK_LIBRARIES bareos bareoscfg ${Readline_LIBRARY})
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
   LIST(APPEND CONSOLE_LINK_LIBRARIES bareosstatic)
 ENDIF()
 

src/dird/CMakeLists.txt

@@ -35,7 +35,7 @@ set(SVRSRCS admin.cc archive.cc authenticate.cc autoprune.cc backup.cc bsr.cc ca
    ua_run.cc ua_select.cc ua_server.cc ua_status.cc ua_tree.cc ua_update.cc
    vbackup.cc verify.cc)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/dird ../include ..)
    LIST(APPEND SVRSRCS
       ../win32/generic/main.cc
@@ -64,7 +64,7 @@ set(BAREOS_DIR_LIBRARIES
    ${NDMP_LIBS}
    )
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND BAREOS_DIR_LIBRARIES
       bareosstatic
       comctl32
@@ -77,7 +77,7 @@ target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES})
 add_executable(bareos-dbcheck ${DBCHKSRCS})
 SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscfg bareoscats)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND DBCHECK_LIBRARIES bareosstatic)
 ENDIF()
 

src/filed/CMakeLists.txt

@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32/generic
       ${CMAKE_SOURCE_DIR}/src/win32/filed
@@ -31,7 +31,7 @@ set(FDSRCS accurate.cc authenticate.cc crypto.cc fd_plugins.cc fileset.cc sd_cmd
     accurate_htable.cc backup.cc dir_cmd.cc filed.cc heartbeat.cc socket_server.cc verify_vol.cc
     accurate_lmdb.cc compression.cc estimate.cc filed_conf.cc restore.cc status.cc)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND FDSRCS
       ../win32/filed/vss.cc
       ../win32/filed/vss_XP.cc
@@ -49,7 +49,7 @@ SET(BAREOS_FD_LIBRARIES
          pthread
          ${LMDB_LIBS}
          )
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND BAREOS_FD_LIBRARIES
       comctl32 bareosstatic
       )

src/findlib/CMakeLists.txt

@@ -23,7 +23,7 @@ SET(BAREOSFIND_SRCS acl.cc attribs.cc bfile.cc create_file.cc drivetype.cc
       enable_priv.cc find_one.cc find.cc fstype.cc hardlink.cc match.cc
       mkpath.cc shadowing.cc xattr.cc)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND BAREOSFIND_SRCS ../win32/findlib/win32.cc)
 ELSE()
    LIST(APPEND BAREOSFIND_SRCS savecwd.cc)

src/lib/CMakeLists.txt

@@ -56,7 +56,7 @@ set (BAREOS_SRCS  address_conf.cc alist.cc attr.cc attribs.cc base64.cc
    tls_gnutls.cc tls_none.cc tls_nss.cc tls_openssl.cc  tree.cc util.cc var.cc
    watchdog.cc workq.cc)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND BAREOS_SRCS
       ../win32/compat/compat.cc
       ../win32/compat/glob.cc
@@ -81,7 +81,7 @@ set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc )
 
 set (BAREOS_STATIC_SRCS parse_conf.cc res.cc)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    add_library(bareosstatic STATIC ${BAREOS_STATIC_SRCS})
    target_link_libraries(bareosstatic bareoscfg)
 ELSE()

src/lmdb/CMakeLists.txt

@@ -23,15 +23,15 @@ add_library(bareoslmdb SHARED mdb.c midl.c)
 # empty the include_directories
 set_property(TARGET bareoslmdb PROPERTY INCLUDE_DIRECTORIES "")
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    add_definitions(-Wall -m64 -mwin32 -mthreads)
 ENDIF()
 
 set_target_properties(bareoslmdb PROPERTIES VERSION "${VERSION}"
                                           SOVERSION "${SOVERSION}"
                                           DEFINE_SYMBOL "BUILDING_DLL"
                                           )
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
 target_link_libraries(bareoslmdb -lntdll)
 ENDIF()
 

src/plugins/dird/CMakeLists.txt

@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32/generic
       ${CMAKE_SOURCE_DIR}/src/win32/dird
@@ -37,7 +37,7 @@ add_library(python-dir MODULE python-dir.cc)
 set_target_properties(python-dir PROPERTIES PREFIX "")
 INSTALL(TARGETS python-dir DESTINATION ${plugindir})
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    target_link_libraries(python-dir python27 bareos)
 ENDIF()
 

src/plugins/filed/CMakeLists.txt

@@ -17,7 +17,7 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32
       ${CMAKE_SOURCE_DIR}/src/win32/include
@@ -45,12 +45,12 @@ ENDIF()
 add_library(bpipe-fd MODULE bpipe-fd.cc)
 set_target_properties(bpipe-fd PROPERTIES PREFIX "")
 INSTALL(TARGETS bpipe-fd DESTINATION ${plugindir})
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    target_link_libraries(bpipe-fd bareos)
 ENDIF()
 
 
-IF(${HAVE_WIN32})
+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 ""
@@ -74,15 +74,15 @@ set_target_properties(rados-fd PROPERTIES PREFIX "")
 INSTALL(TARGETS rados-fd DESTINATION ${plugindir})
 endif()
 
-IF(NOT ${HAVE_WIN32})
+IF(NOT HAVE_WIN32)
    add_library(example-plugin-fd MODULE example-plugin-fd.cc)
    set_target_properties(example-plugin-fd PROPERTIES PREFIX "")
 ENDIF()
 
 add_library(python-fd MODULE python-fd.cc)
 set_target_properties(python-fd PROPERTIES PREFIX "")
 INSTALL(TARGETS python-fd DESTINATION ${plugindir})
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    target_link_libraries(python-fd python27 bareos)
 ENDIF()
 

src/qt-tray-monitor/CMakeLists.txt

@@ -20,7 +20,7 @@
 cmake_minimum_required(VERSION 3.0)
 # (for AUTOUIC)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
   add_definitions(-D_STAT_DEFINED=1)
 ENDIF()
 
@@ -32,7 +32,7 @@ set(CMAKE_AUTORCC ON)
 
 find_package(Qt4 REQUIRED)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(
       ${CMAKE_SOURCE_DIR}/src/win32/include
       ${CMAKE_SOURCE_DIR}/src/win32/lib
@@ -50,7 +50,7 @@ set(SOURCES
    )
 set(TRAYMON_LIBRARIES bareos-tray-monitor Qt4::QtGui bareos bareoscfg)
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND TRAYMON_LIBRARIES
       bareosstatic
       )

src/stored/CMakeLists.txt

@@ -17,7 +17,7 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/stored  ${CMAKE_SOURCE_DIR}/src/stored/backends ../include .. .)
 ELSE()
    include_directories(. .. ../lib ../include ../lmdb ../ndmp)
@@ -29,7 +29,7 @@ if(NOT ${HAVE_DYNAMIC_SD_BACKENDS})
          backends/generic_tape_device.cc
        )
 
-   IF(${HAVE_WIN32})
+   IF(HAVE_WIN32)
       LIST(APPEND AVAILABLE_DEVICE_API_SRCS
          ${CMAKE_SOURCE_DIR}/src/win32/stored/backends/win32_fifo_device.cc
          ${CMAKE_SOURCE_DIR}/src/win32/stored/backends/win32_file_device.cc
@@ -80,7 +80,7 @@ set(SDSRCS append.cc askdir.cc authenticate.cc dir_cmd.cc fd_cmds.cc
          job.cc mac.cc ndmp_tape.cc read.cc sd_cmds.cc sd_stats.cc
          socket_server.cc status.cc stored.cc
 )
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND SDSRCS
       ../win32/generic/main.cc
       ../win32/generic/service.cc
@@ -117,7 +117,7 @@ add_library(bareossd SHARED ${LIBBAREOSSD_SRCS})
 
 SET(LIBBAREOSSD_LIBRARIES bareos ${BACKEND_OBJECTS})
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND LIBBAREOSSD_LIBRARIES
       bareosstatic
       )
@@ -135,7 +135,7 @@ SET(BAREOS_SD_LIBRARIES
    ${NDMP_LIBS}
    )
 
-IF(${HAVE_WIN32})
+IF(HAVE_WIN32)
    LIST(APPEND BAREOS_SD_LIBRARIES
       comctl32
       )

src/tests/CMakeLists.txt

@@ -27,7 +27,7 @@ target_link_libraries(bregtest bareos ${JANSSON_LIBRARIES})
 add_executable(testls testls.cc)
 target_link_libraries(testls bareosfind bareos ${JANSSON_LIBRARIES})
 
-IF(NOT ${HAVE_WIN32})
+IF(NOT HAVE_WIN32)
    add_executable(bbatch bbatch.cc)
    target_link_libraries(bbatch bareoscats bareos  ${JANSSON_LIBRARIES})
 ENDIF()
@@ -47,7 +47,7 @@ target_link_libraries(grow bareos ${JANSSON_LIBRARIES})
 set (TESTS_SBIN
    bregtest grow testls
    )
-IF(NOT ${HAVE_WIN32})
+IF(NOT HAVE_WIN32)
    LIST(APPEND TESTS_SBIN bbatch)
 ENDIF()