設定を一時待避

Author: azukizuki

CMakeLists.txt

@@ -308,11 +308,21 @@ if(APPLE)
 #endif
 ")
   include_directories(BEFORE SYSTEM "${FP_H_COMPAT_DIR}")
+
+  # libpngのビルド時のみCFLAGSを一時的に変更するため、現在の値を保存
+  set(CMAKE_C_FLAGS_SAVE "${CMAKE_C_FLAGS}")
+  set(CMAKE_CXX_FLAGS_SAVE "${CMAKE_CXX_FLAGS}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isystem ${FP_H_COMPAT_DIR}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${FP_H_COMPAT_DIR}")
 endif()
 
 add_subdirectory("3rdparty/libpng")
+
+# libpngのビルド後、CFLAGSを元に戻す（他のサブプロジェクトに影響を与えないため）
+if(APPLE)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_SAVE}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVE}")
+endif()
 set(PNG_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libpng"
         "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/libpng")