Fixed CMAKE_OSX_DEPLOYMENT_TARGET.

ggarra13 · Oct 5, 2023 · 184492e · 184492e
1 parent 8c06eef
commit 184492e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake b/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake
@@ -3,8 +3,12 @@ if(WIN32)
 else()
 
     if(APPLE)
-        set(LCMS2_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_CXX_FLAGS}")
-        set(LCMS2_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_C_FLAGS}")
+        set(LCMS2_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        set(LCMS2_C_FLAGS "${CMAKE_C_FLAGS}")
+	if (CMAKE_OSX_DEPLOYMENT_TARGET)
+            list(APPEND LCMS2_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            list(APPEND LCMS2_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+	endif()
     endif()
 
     set(LCMS2_BUILD_ARGS

diff --git a/etc/SuperBuild/cmake/Modules/BuildVPX.cmake b/etc/SuperBuild/cmake/Modules/BuildVPX.cmake
@@ -16,8 +16,12 @@ else()
     set(VPX_LDFLAGS)
 
     if(APPLE)
-        set(VPX_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_CXX_FLAGS}")
-        set(VPX_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_C_FLAGS}")
+        set(VPX_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        set(VPX_C_FLAGS "${CMAKE_C_FLAGS}")
+	if (CMAKE_OSX_DEPLOYMENT_TARGET)
+            list(APPEND VPX_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            list(APPEND VPX_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+	endif()
     endif()
 
     set(VPX_CONFIGURE_ARGS

diff --git a/etc/SuperBuild/cmake/Modules/BuildX264.cmake b/etc/SuperBuild/cmake/Modules/BuildX264.cmake
@@ -14,8 +14,12 @@ else()
     set(X264_LDFLAGS)
 
     if(APPLE)
-        set(X264_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_CXX_FLAGS}")
-        set(X264_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CMAKE_C_FLAGS}")
+        set(X264_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        set(X264_C_FLAGS "${CMAKE_C_FLAGS}")
+	if (CMAKE_OSX_DEPLOYMENT_TARGET)
+            list(APPEND X264_CXX_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            list(APPEND X264_C_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+	endif()
     endif()
 
     set(X264_CONFIGURE_ARGS