some best practices

Author: LimitlessGreen

src/CMakeLists.txt

@@ -39,8 +39,7 @@ set(IMAGER_VERSION_MINOR 0)
 set(IMAGER_VERSION_PATCH 6)
 set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.${IMAGER_VERSION_PATCH}")
 set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},${IMAGER_VERSION_PATCH},0")
-add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
-add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
+# Version definitions will be added to target later
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -95,11 +94,7 @@ set(XZ_ENCODERS
 )
 set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE)
 set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE)
-FetchContent_GetProperties(xz)
-if(NOT xz_POPULATED)
-    FetchContent_Populate(xz)
-    add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(xz)
 unset(XZ_MICROLZMA_DECODER)
 unset(XZ_MICROLZMA_ENCODER)
 unset(XZ_LZIP_DECODER)
@@ -108,14 +103,15 @@ unset(XZ_BUILD_SHARED_LIBS)
 unset(XZ_ENABLE_DOXYGEN)
 unset(CREATE_LZMA_SYMLINKS)
 unset(CREATE_XZ_SYMLINKS)
-set(LIBLZMA_FOUND true CACHE BOOL "" FORCE)
-set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
-set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
-set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)
-set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
-set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
-set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
-set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
+# Set LZMA variables for compatibility (avoid FORCE unless necessary)
+set(LIBLZMA_FOUND true CACHE BOOL "LZMA library found")
+set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "LZMA include directory")
+set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "LZMA include directories")
+set(LIBLZMA_LIBRARY liblzma CACHE STRING "LZMA library target")
+set(LIBLZMA_LIBRARIES liblzma CACHE STRING "LZMA libraries")
+set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "LZMA has auto decoder")
+set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "LZMA has easy encoder")
+set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "LZMA has preset")
 
 # Bundled zstd
 set(ZSTD_VERSION "1.5.7")
@@ -130,25 +126,22 @@ set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
 set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)
 set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
-FetchContent_GetProperties(zstd)
-if(NOT zstd_POPULATED)
-    FetchContent_Populate(zstd)
-    add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(zstd)
 unset(ZSTD_BUILD_PROGRAMS)
 unset(ZSTD_BUILD_SHARED)
 unset(ZSTD_BUILD_STATIC)
 unset(ZSTD_BUILD_TESTS)
 unset(ZSTD_BUILD_DICTBUILDER)
-set(ZSTD_FOUND true CACHE BOOL "" FORCE)
-set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE)
-set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
-set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
-set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
+# Set ZSTD variables for compatibility
+set(ZSTD_FOUND true CACHE BOOL "ZSTD library found")
+set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "ZSTD version")
+set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "ZSTD include directory")
+set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "ZSTD include directory")
+set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "ZSTD include directories")
+set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "ZSTD include directories")
+set(Zstd_LIBRARIES libzstd_static CACHE STRING "ZSTD libraries")
+set(ZSTD_LIBRARIES libzstd_static CACHE STRING "ZSTD libraries")
+set(ZSTD_LIBRARY libzstd_static CACHE STRING "ZSTD library target")
 
 if (NOT APPLE)
     # Bundled zlib (Windows/Linux only)
@@ -173,16 +166,15 @@ if (NOT APPLE)
     unset(ZLIB_BUILD_STATIC)
     unset(ZLIB_BUILD_TESTS)
     unset(SKIP_INSTALL_ALL)
-    set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
-    set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
+    set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "Use static ZLIB")
+    set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "ZLIB root directory")
 
-    # Create proper ZLIB::ZLIB alias target instead of IMPORTED target
-    # This avoids hardcoded paths and lets CMake handle dependencies automatically
-    set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
-    set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR};${zlib_BINARY_DIR} CACHE PATH "" FORCE)
-    set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE)
-    set(ZLIB_LIBRARY zlibstatic CACHE STRING "" FORCE)
-    set(ZLIB_LIBRARIES zlibstatic CACHE STRING "" FORCE)
+    # Set ZLIB variables for compatibility
+    set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "ZLIB include directory")
+    set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR};${zlib_BINARY_DIR} CACHE PATH "ZLIB include directories")
+    set(ZLIB_FOUND TRUE CACHE BOOL "ZLIB library found")
+    set(ZLIB_LIBRARY zlibstatic CACHE STRING "ZLIB library target")
+    set(ZLIB_LIBRARIES zlibstatic CACHE STRING "ZLIB libraries")
 
     # Create ZLIB::ZLIB alias target pointing to the actual zlibstatic target
     # This lets CMake handle the actual library path and build dependencies automatically
@@ -233,9 +225,9 @@ set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "")
 set(ENABLE_ZSTD ON CACHE BOOL "")
 set(ENABLE_LZMA ON CACHE BOOL "")
 # Point libarchive to our bundled LZMA
-set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
-set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)
-set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE)
+set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "LZMA include for libarchive")
+set(LIBLZMA_LIBRARY liblzma CACHE STRING "LZMA library for libarchive")
+set(POSIX_REGEX_LIB "libc" CACHE STRING "Regex library for libarchive")
 set(LIBARCHIVE_VERSION "3.8.1")
 
 FetchContent_Declare(libarchive
@@ -278,10 +270,11 @@ unset(ENABLE_CAT)
 unset(ARCHIVE_BUILD_SHARED_LIBS)
 unset(ENABLE_ZSTD)
 unset(ENABLE_LZMA)
-set(LibArchive_FOUND true CACHE BOOL "" FORCE)
-set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
-set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
-set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
+# Set LibArchive variables for compatibility
+set(LibArchive_FOUND true CACHE BOOL "LibArchive library found")
+set(LibArchive_LIBRARIES archive_static CACHE STRING "LibArchive libraries")
+set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "LibArchive include directory")
+set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "LibArchive include directories")
 
 # Bundled libcurl
 set(CURL_VERSION "8.14.1")
@@ -427,10 +420,11 @@ unset(CURL_USE_SCHANNEL)
 unset(CURL_DEFAULT_SSL_BACKEND)
 unset(CURL_USE_GNUTLS)
 
-set(CURL_FOUND true CACHE BOOL "" FORCE)
-set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
-set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
-set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
+# Set CURL variables for compatibility
+set(CURL_FOUND true CACHE BOOL "CURL library found")
+set(CURL_LIBRARIES libcurl_static CACHE STRING "CURL libraries")
+set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "CURL include directory")
+set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "CURL include directories")
 
 # Adding headers explicity so they are displayed in Qt Creator
 set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
@@ -458,7 +452,7 @@ elseif (UNIX)
     )
     set(EXTRALIBS ${EXTRALIBS} GnuTLS::GnuTLS)
     set(DEPENDENCIES "")
-    add_definitions(-DHAVE_GNUTLS)
+    # Platform definitions will be added after target creation
 elseif (WIN32)
     set(PLATFORM_SOURCES
         acceleratedcryptographichash.cpp
@@ -471,11 +465,10 @@ elseif (WIN32)
         windows/openhdimagewriter.rc
     )
     set(EXTRALIBS setupapi wlanapi)
-    add_definitions(-DHAVE_WINCRYPT)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    # Platform definitions will be added after target creation
 endif()
 
-include_directories(BEFORE .)
+# Include directories handled via target properties
 
 # Test if we need libatomic
 include(CheckCXXSourceCompiles)
@@ -496,7 +489,7 @@ if (NOT atomicbuiltin)
         endif()
 endif()
 
-include_directories(BEFORE .)
+# Include directories handled via target properties
 
 # Test if we need libatomic
 include(CheckCXXSourceCompiles)
@@ -561,6 +554,39 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY AUTOMOC ON)
 set_property(TARGET ${PROJECT_NAME} PROPERTY AUTORCC ON)
 set_property(TARGET ${PROJECT_NAME} PROPERTY AUTOUIC ON)
 
+# Target-based compile definitions (modern CMake best practice)
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    IMAGER_VERSION_STR="${IMAGER_VERSION_STR}"
+    IMAGER_VERSION_CSV=${IMAGER_VERSION_CSV}
+    $<$<BOOL:${ENABLE_TELEMETRY}>:TELEMETRY_ENABLED_DEFAULT=true>
+    $<$<NOT:$<BOOL:${ENABLE_TELEMETRY}>>:TELEMETRY_ENABLED_DEFAULT=false>
+    $<$<BOOL:${ENABLE_CHECK_VERSION}>:CHECK_VERSION_DEFAULT=true>
+    $<$<NOT:$<BOOL:${ENABLE_CHECK_VERSION}>>:CHECK_VERSION_DEFAULT=false>
+)
+
+# Platform-specific definitions
+if(UNIX AND NOT APPLE)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_GNUTLS)
+elseif(WIN32)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE 
+        HAVE_WINCRYPT
+        _CRT_SECURE_NO_WARNINGS
+        WINVER=0x0A00
+        _WIN32_WINNT=0x0A00
+        NTDDI_VERSION=0x0A000000
+    )
+endif()
+
+# Target-based include directories (modern CMake best practice)
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CURL_INCLUDE_DIR}
+    ${LibArchive_INCLUDE_DIR}
+    ${LIBLZMA_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
+    ${ZSTD_INCLUDE_DIR}
+)
+
 # Create lupdate target (after executable target is created)
 qt_add_lupdate(${PROJECT_NAME}
     TS_FILES ${TRANSLATIONS}
@@ -578,17 +604,7 @@ qt_add_lupdate(${PROJECT_NAME}
 #     message(STATUS "LTO not supported: <${ipoerror}>")
 # endif()
 
-if(ENABLE_TELEMETRY)
-    add_definitions(-DTELEMETRY_ENABLED_DEFAULT=true)
-else()
-    add_definitions(-DTELEMETRY_ENABLED_DEFAULT=false)
-endif()
-
-if(ENABLE_CHECK_VERSION)
-    add_definitions(-DCHECK_VERSION_DEFAULT=true)
-else()
-    add_definitions(-DCHECK_VERSION_DEFAULT=false)
-endif()
+# Feature definitions will be added to target after creation
 
 qt_policy(SET QTP0001 NEW)
 
@@ -626,8 +642,7 @@ qt_add_qml_module(${PROJECT_NAME}
 
 # Because dependencies are typically not available by default on Windows, build bundled code
 if (WIN32)
-    # Target Windows 10, in line with Qt6 requirements
-    add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000000)
+    # Target Windows 10, in line with Qt6 requirements (definitions added to target)
 
     # Strip debug symbols
     add_custom_command(TARGET ${PROJECT_NAME}
@@ -725,7 +740,7 @@ endif()
 if(TARGET ZLIB::ZLIB)
     add_dependencies(${PROJECT_NAME} ZLIB::ZLIB)
 endif()
-include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR})
+# Include directories will be set via target properties
 
 # Set up ZLIB library variable for linking
 if(TARGET ZLIB::ZLIB)