build: CMake: replace deprecated add_definitions with preferred add_compile_definitions (#1821)

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

CMakeLists.txt

@@ -118,28 +118,28 @@ option (OSL_USTRINGREP_IS_HASH "Always use ustringhash for strings" OFF)
 
 set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
 if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-    add_definitions ("-DOSL_NO_DEFAULT_TEXTURESYSTEM=1")
+    add_compile_definitions (OSL_NO_DEFAULT_TEXTURESYSTEM=1)
 endif ()
 
 option (USE_FAST_MATH "Use fast math approximations (if no, then use system math library)" ON)
 if (USE_FAST_MATH)
-    add_definitions ("-DOSL_FAST_MATH=1")
+    add_compile_definitions (OSL_FAST_MATH=1)
 else ()
-    add_definitions ("-DOSL_FAST_MATH=0")
+    add_compile_definitions (OSL_FAST_MATH=0)
 endif ()
 
 option (OIIO_FMATH_SIMD_FRIENDLY "Make sure OIIO fmath functions are SIMD-friendly" OFF)
 if (OIIO_FMATH_SIMD_FRIENDLY)
-    add_definitions (-DOIIO_FMATH_SIMD_FRIENDLY=1)
+    add_compile_definitions (OIIO_FMATH_SIMD_FRIENDLY=1)
 endif ()
 
 # Define OSL_INTERNAL symbol only when building OSL itself, will not be
 # defined for downstream projects using OSL.
-add_definitions (-DOSL_INTERNAL=1)
+add_compile_definitions (OSL_INTERNAL=1)
 
 # To make sure we aren't relying on deprecated OIIO features, we define
 # OIIO_DISABLE_DEPRECATED before including any OIIO headers.
-add_definitions (-DOIIO_DISABLE_DEPRECATED=900000)
+add_compile_definitions (OIIO_DISABLE_DEPRECATED=900000)
 
 # Set the default namespace. For symbol hiding reasons, it's important that
 # the project name is a subset of the namespace name.

doc/build_install/windows/build_osl.py

@@ -896,7 +896,7 @@ def InstallPtex_Windows(context, force, buildArgs):
         )
         PatchFile(
             "src\\tests\\CMakeLists.txt",
-            [("add_definitions(-DPTEX_STATIC)", "# add_definitions(-DPTEX_STATIC)")],
+            [("add_compile_definitions(PTEX_STATIC)", "# add_compile_definitions(PTEX_STATIC)")],
         )
 
         # Patch Ptex::String to export symbol for operator<<

src/cmake/checked_find_package.cmake

@@ -37,7 +37,7 @@ endfunction ()
 #     turned off explicitly from one of these sources.
 #   * Print a message if the package is enabled but not found. This is based
 #     on ${Pkgname}_FOUND or $PKGNAME_FOUND.
-#   * Optional DEFINITIONS <string>... are passed to add_definitions if the
+#   * Optional DEFINITIONS <string>... are passed to add_compile_definitions if the
 #     package is found.
 #   * Optional SETVARIABLES <id>... is a list of CMake variables to set to
 #     TRUE if the package is found (they will not be set or changed if the
@@ -155,7 +155,7 @@ macro (checked_find_package pkgname)
                 endif ()
             endforeach ()
             message (STATUS "${ColorGreen}Found ${pkgname} ${${pkgname}_VERSION} ${_config_status}${ColorReset}")
-            add_definitions (${_pkg_DEFINITIONS})
+            add_compile_definitions (${_pkg_DEFINITIONS})
             foreach (_v IN LISTS _pkg_SETVARIABLES)
                 set (${_v} TRUE)
             endforeach ()

src/cmake/compiler.cmake

@@ -183,8 +183,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
     # Options common to gcc and clang
 
     # Ensure this macro is set for stdint.h
-    add_definitions ("-D__STDC_LIMIT_MACROS")
-    add_definitions ("-D__STDC_CONSTANT_MACROS")
+    add_compile_definitions (__STDC_LIMIT_MACROS)
+    add_compile_definitions (__STDC_CONSTANT_MACROS)
     # this allows native instructions to be used for sqrtf instead of a function call
     add_compile_options ("-fno-math-errno")
 endif ()
@@ -197,11 +197,11 @@ endif ()
 if (MSVC)
     # Microsoft specific options
     string (REGEX REPLACE "/W[1-4]" "/W1" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    add_definitions (-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-    add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
-    add_definitions (-D_SCL_SECURE_NO_WARNINGS)
-    add_definitions (-DJAS_WIN_MSVC_BUILD)
+    add_compile_definitions (_CRT_SECURE_NO_DEPRECATE)
+    add_compile_definitions (_CRT_SECURE_NO_WARNINGS)
+    add_compile_definitions (_CRT_NONSTDC_NO_WARNINGS)
+    add_compile_definitions (_SCL_SECURE_NO_WARNINGS)
+    add_compile_definitions (JAS_WIN_MSVC_BUILD)
 endif (MSVC)
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
@@ -284,7 +284,7 @@ endif ()
 set (GLIBCXX_USE_CXX11_ABI "" CACHE STRING "For gcc, use the new C++11 library ABI (0|1)")
 if (CMAKE_COMPILER_IS_GNUCC AND ${GCC_VERSION} VERSION_GREATER_EQUAL 5.0)
     if (NOT ${GLIBCXX_USE_CXX11_ABI} STREQUAL "")
-        add_definitions ("-D_GLIBCXX_USE_CXX11_ABI=${GLIBCXX_USE_CXX11_ABI}")
+        add_compile_definitions (_GLIBCXX_USE_CXX11_ABI=${GLIBCXX_USE_CXX11_ABI})
     endif ()
 endif ()
 
@@ -368,7 +368,7 @@ option (CODECOV "Build code coverage tests" OFF)
 if (CODECOV AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG))
     message (STATUS "Compiling for code coverage analysis")
     add_compile_options (-ftest-coverage -fprofile-arcs)
-    add_definitions ("-D${PROJ_NAME}_CODE_COVERAGE=1")
+    add_compile_definitions (${PROJ_NAME}_CODE_COVERAGE=1)
     link_libraries(gcov)
 endif ()
 
@@ -388,9 +388,9 @@ if (SANITIZE AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG))
     add_compile_options (-g -fno-omit-frame-pointer)
     if (CMAKE_COMPILER_IS_GNUCC)
         # turn on glibcxx extra annotations to find vector writes past end
-        add_definitions ("-D_GLIBCXX_SANITIZE_VECTOR=1")
+        add_compile_definitions (_GLIBCXX_SANITIZE_VECTOR=1)
     endif ()
-    add_definitions ("-D${PROJECT_NAME}_SANITIZE=1")
+    add_compile_definitions (${PROJECT_NAME}_SANITIZE=1)
 endif ()
 
 
@@ -524,7 +524,7 @@ message(VERBOSE "Setting SOVERSION to: ${SOVERSION}")
 #
 option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON)
 if (NOT BUILD_SHARED_LIBS)
-    add_definitions (-D${PROJECT_NAME}_STATIC_DEFINE=1)
+    add_compile_definitions (${PROJECT_NAME}_STATIC_DEFINE=1)
 endif ()
 
 
@@ -549,7 +549,7 @@ endif ()
 # We expect our own CI runs to define env variable ${PROJECT_NAME}_CI
 #
 if (DEFINED ENV{${PROJECT_NAME}_CI})
-    add_definitions (-D${PROJ_NAME}_CI=1 -DBUILD_CI=1)
+    add_compile_definitions (${PROJ_NAME}_CI=1 BUILD_CI=1)
     if (APPLE)
         # Keep Mono framework from being incorrectly searched for include
         # files on GitHub Actions CI.

src/cmake/cuda_macros.cmake

@@ -11,7 +11,7 @@ set (CUDA_OPT_FLAG_CLANG "-O3" CACHE STRING "The optimization level to use when
 # host behavior, etc.
 set (CUDA_NO_FTZ OFF CACHE BOOL "Do not enable force-to-zero when compiling for CUDA")
 if (CUDA_NO_FTZ)
-    add_definitions ("-DOSL_CUDA_NO_FTZ=1")
+    add_compile_definitions (DOSL_CUDA_NO_FTZ=1)
 endif ()
 
 # Compile a CUDA file to PTX using NVCC

src/cmake/externalpackages.cmake

@@ -50,7 +50,7 @@ checked_find_package (OpenEXR REQUIRED
 # install version of 2.x.
 include_directories(BEFORE ${IMATH_INCLUDES})
 if (MSVC AND NOT LINKSTATIC)
-    add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
+    add_compile_definitions (OPENEXR_DLL) # Is this needed for new versions?
 endif ()
 
 if (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.5.99)
@@ -63,7 +63,7 @@ endif ()
 # OpenImageIO
 checked_find_package (OpenImageIO REQUIRED
                       VERSION_MIN 2.4
-                      DEFINITIONS -DOIIO_HIDE_FORMAT=1)
+                      DEFINITIONS OIIO_HIDE_FORMAT=1)
 
 checked_find_package (pugixml REQUIRED
                       VERSION_MIN 1.8)
@@ -80,10 +80,10 @@ link_directories ("${LLVM_LIB_DIR}")
 # Extract and concatenate major & minor, remove wayward patches,
 # dots, and "svn" or other suffixes.
 string (REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1\\2" OSL_LLVM_VERSION ${LLVM_VERSION})
-add_definitions (-DOSL_LLVM_VERSION=${OSL_LLVM_VERSION})
-add_definitions (-DOSL_LLVM_FULL_VERSION="${LLVM_VERSION}")
+add_compile_definitions (OSL_LLVM_VERSION=${OSL_LLVM_VERSION})
+add_compile_definitions (OSL_LLVM_FULL_VERSION="${LLVM_VERSION}")
 if (LLVM_NAMESPACE)
-    add_definitions ("-DLLVM_NAMESPACE=${LLVM_NAMESPACE}")
+    add_compile_definitions (LLVM_NAMESPACE=${LLVM_NAMESPACE})
 endif ()
 if (APPLE AND LLVM_VERSION VERSION_EQUAL 10.0.1 AND EXISTS "/usr/local/Cellar/llvm")
     message (WARNING
@@ -118,15 +118,15 @@ endif ()
 # Use opaque pointers starting with LLVM 16
 if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16.0)
   set(LLVM_OPAQUE_POINTERS ON)
-  add_definitions (-DOSL_LLVM_OPAQUE_POINTERS)
+  add_compile_definitions (OSL_LLVM_OPAQUE_POINTERS)
 else()
   set(LLVM_OPAQUE_POINTERS OFF)
 endif()
 
 # Enable new pass manager for LLVM 16+
 if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16.0)
   set(LLVM_NEW_PASS_MANAGER ON)
-  add_definitions (-DOSL_LLVM_NEW_PASS_MANAGER)
+  add_compile_definitions (OSL_LLVM_NEW_PASS_MANAGER)
 else()
   set(LLVM_NEW_PASS_MANAGER OFF)
 endif()
@@ -215,7 +215,7 @@ if (OSL_USE_OPTIX)
     function (osl_optix_target TARGET)
         target_include_directories (${TARGET} BEFORE PRIVATE ${CUDA_INCLUDES} ${OPTIX_INCLUDES})
         ## XXX: Should -DPTX_PATH point to (or include) CMAKE_CURRENT_BINARY_DIR so tests can run before installation ?
-        target_compile_definitions (${TARGET} PRIVATE "-DPTX_PATH=\"${OSL_PTX_INSTALL_DIR}\"")
+        target_compile_definitions (${TARGET} PRIVATE PTX_PATH="${OSL_PTX_INSTALL_DIR}")
         target_link_libraries (${TARGET} PRIVATE ${CUDA_LIBRARIES} ${CUDA_EXTRA_LIBS} ${OPTIX_LIBRARIES} ${OPTIX_EXTRA_LIBS})
     endfunction()
 else ()

src/cmake/flexbison.cmake

@@ -41,7 +41,7 @@ if ( FLEX_EXECUTABLE AND BISON_EXECUTABLE )
     macro ( FLEX_BISON flexsrc bisonsrc prefix srclist compiler_headers )
         # mangle osoparse & oslparse symbols to avoid multiple library conflicts
         # XXX: This may be excessive now that OSL::pvt::ExtraArg is mangled into the function signature
-        add_definitions(-D${prefix}parse=${PROJ_NAMESPACE_V}_${prefix}parse)
+        add_compile_definitions(${prefix}parse=${PROJ_NAMESPACE_V}_${prefix}parse)
 
         message (VERBOSE "FLEX_BISON flex=${flexsrc} bison=${bisonsrc} prefix=${prefix}")
         get_filename_component ( bisonsrc_we ${bisonsrc} NAME_WE )

src/liboslexec/CMakeLists.txt

@@ -211,7 +211,7 @@ if (USE_LLVM_BITCODE)
     EMBED_LLVM_BITCODE_IN_CPP ( "${rs_dependent_ops_srcs}" "_host_rs" "osl_llvm_compiled_rs_dependent_ops" lib_src "" "${include_dirs}")
 
     if (CUDA_FOUND)
-        add_definitions (-DOSL_LLVM_CUDA_BITCODE)
+        add_compile_definitions (OSL_LLVM_CUDA_BITCODE)
 
         # The shadeops are compiled to both LLVM bitcode and PTX, and embedded
         # in liboslexec in binary format. The bitcode is used to seed the LLVM
@@ -255,7 +255,7 @@ else ()
     # With MSVC/Mingw, we don't compile llvm_ops.cpp to LLVM bitcode, due
     # to clang being unable to compile MSVC C++ header files at this time.
     # Instead it is part of the regular build process.
-    add_definitions (-DOSL_LLVM_NO_BITCODE)
+    add_compile_definitions (OSL_LLVM_NO_BITCODE)
     set (lib_src ${lib_src} llvm_ops.cpp)
 endif ()
 

src/testrender/CMakeLists.txt

@@ -33,7 +33,7 @@ if (OSL_USE_OPTIX)
     endforeach ()
 
     # Compile the renderer-supplied shadeops (rend_lib) to LLVM bitcode and PTX
-    add_definitions (-DOSL_LLVM_CUDA_BITCODE)
+    add_compile_definitions (OSL_LLVM_CUDA_BITCODE)
     CUDA_SHADEOPS_COMPILE ( "rend_lib_testrender"
         rend_lib_bc
         rend_lib_ptx

src/testshade/CMakeLists.txt

@@ -38,7 +38,7 @@ if (OSL_USE_OPTIX)
     endforeach ()
 
     # Compile the renderer-supplied shadeops (rend_lib) to LLVM bitcode and PTX
-    add_definitions (-DOSL_LLVM_CUDA_BITCODE)
+    add_compile_definitions (OSL_LLVM_CUDA_BITCODE)
     CUDA_SHADEOPS_COMPILE ( "rend_lib_testshade"
         rend_lib_bc
         rend_lib_ptx