Merge pull request #6629 from louisdh/swift-active-comp-cond

Inherit pod defined values for SWIFT_ACTIVE_COMPILATION_CONDITIONS

CHANGELOG.md

@@ -18,7 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [postmechanical](https://github.com/postmechanical)
   [#6595](https://github.com/CocoaPods/CocoaPods/issues/6595)
 
-
+* Inherit pod defined values for `SWIFT_ACTIVE_COMPILATION_CONDITIONS`.    
+  [Louis D'hauwe](https://github.com/louisdh)
+  [#6629](https://github.com/CocoaPods/CocoaPods/pull/6629)
+  
 ## 1.2.1 (2017-04-11)
 
 ##### Enhancements

lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -54,6 +54,7 @@ module Pod
             'PODS_TARGET_SRCROOT' => target.pod_target_srcroot,
             'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
             'SKIP_INSTALL' => 'YES',
+            'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => '$(inherited) ',
             # 'USE_HEADERMAP' => 'NO'
           }
 

lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -59,6 +59,8 @@ module Pod
             settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = ''
             settings['CODE_SIGN_IDENTITY[sdk=watchos*]'] = ''
 
+            settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = '$(inherited) '
+
             if target.swift_version
               settings['SWIFT_VERSION'] = target.swift_version
             end

lib/cocoapods/project.rb

@@ -254,6 +254,11 @@ module Pod
         end
       end
       settings['GCC_PREPROCESSOR_DEFINITIONS'] = definitions
+
+      if type == :debug
+        settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = 'DEBUG'
+      end
+
       build_configuration
     end
 

cocoapods-integration-specs @ 0cb57dc9

-Subproject commit 04072c13296783a87f1afb5947cb84097d0d3808
+Subproject commit 0cb57dc945ce66fbf07e352bb6f51f74a2e460f6