Skip to content

Commit 240889c

Browse files
eskrocheskroch
committed
Merge branch 'master' into release-2.0
2 parents 1fc84e6 + 7b6ee58 commit 240889c

7 files changed

Lines changed: 0 additions & 19 deletions

File tree

‎QCPlugin/CorePlotQCPlugin.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@
392392
CLANG_ENABLE_OBJC_ARC = YES;
393393
COMBINE_HIDPI_IMAGES = YES;
394394
COPY_PHASE_STRIP = NO;
395-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
396395
GCC_DYNAMIC_NO_PIC = NO;
397396
GCC_MODEL_TUNING = G5;
398397
GCC_OPTIMIZATION_LEVEL = 0;
@@ -417,7 +416,6 @@
417416
CLANG_ENABLE_OBJC_ARC = YES;
418417
COMBINE_HIDPI_IMAGES = YES;
419418
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
420-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
421419
GCC_MODEL_TUNING = G5;
422420
GCC_PRECOMPILE_PREFIX_HEADER = YES;
423421
GCC_PREFIX_HEADER = CorePlotQCPlugin_Prefix.pch;
@@ -439,7 +437,6 @@
439437
buildSettings = {
440438
ALWAYS_SEARCH_USER_PATHS = NO;
441439
ENABLE_TESTABILITY = YES;
442-
FRAMEWORK_SEARCH_PATHS = "";
443440
GCC_C_LANGUAGE_STANDARD = c99;
444441
MACOSX_DEPLOYMENT_TARGET = 10.8;
445442
ONLY_ACTIVE_ARCH = YES;
@@ -452,7 +449,6 @@
452449
baseConfigurationReference = C3C8CFF619E9504C007E0BCB /* CorePlotWarnings.xcconfig */;
453450
buildSettings = {
454451
ALWAYS_SEARCH_USER_PATHS = NO;
455-
FRAMEWORK_SEARCH_PATHS = "";
456452
GCC_C_LANGUAGE_STANDARD = c99;
457453
MACOSX_DEPLOYMENT_TARGET = 10.8;
458454
OTHER_LDFLAGS = "";

‎examples/CPTTestApp/CPTTestApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@
349349
CLANG_ENABLE_OBJC_ARC = YES;
350350
COMBINE_HIDPI_IMAGES = YES;
351351
COPY_PHASE_STRIP = NO;
352-
FRAMEWORK_SEARCH_PATHS = "";
353352
GCC_DYNAMIC_NO_PIC = NO;
354353
GCC_MODEL_TUNING = G5;
355354
GCC_OPTIMIZATION_LEVEL = 0;
@@ -390,7 +389,6 @@
390389
baseConfigurationReference = C3880C3919DCD6A000ED0618 /* CorePlotWarnings.xcconfig */;
391390
buildSettings = {
392391
ALWAYS_SEARCH_USER_PATHS = NO;
393-
FRAMEWORK_SEARCH_PATHS = "";
394392
GCC_C_LANGUAGE_STANDARD = c99;
395393
GCC_OPTIMIZATION_LEVEL = 0;
396394
GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -408,7 +406,6 @@
408406
baseConfigurationReference = C3880C3919DCD6A000ED0618 /* CorePlotWarnings.xcconfig */;
409407
buildSettings = {
410408
ALWAYS_SEARCH_USER_PATHS = NO;
411-
FRAMEWORK_SEARCH_PATHS = "";
412409
GCC_C_LANGUAGE_STANDARD = c99;
413410
GCC_PREPROCESSOR_DEFINITIONS = "";
414411
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/CorePlotGallery/Plot_Gallery_Mac.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@
556556
CLANG_ENABLE_OBJC_ARC = YES;
557557
COMBINE_HIDPI_IMAGES = YES;
558558
COPY_PHASE_STRIP = NO;
559-
FRAMEWORK_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../build/Debug\"/**";
560559
GCC_DYNAMIC_NO_PIC = NO;
561560
GCC_MODEL_TUNING = G5;
562561
GCC_OPTIMIZATION_LEVEL = 0;
@@ -584,7 +583,6 @@
584583
CLANG_ENABLE_OBJC_ARC = YES;
585584
COMBINE_HIDPI_IMAGES = YES;
586585
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
587-
FRAMEWORK_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../build/Release\"/**";
588586
GCC_MODEL_TUNING = G5;
589587
GCC_OPTIMIZATION_LEVEL = s;
590588
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -608,7 +606,6 @@
608606
baseConfigurationReference = C3C0DF2719D86B5E00631CAD /* CorePlotWarnings.xcconfig */;
609607
buildSettings = {
610608
ENABLE_TESTABILITY = YES;
611-
FRAMEWORK_SEARCH_PATHS = "";
612609
GCC_C_LANGUAGE_STANDARD = gnu99;
613610
GCC_OPTIMIZATION_LEVEL = 0;
614611
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/DatePlot/DatePlot.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@
371371
CLANG_ENABLE_OBJC_ARC = YES;
372372
COMBINE_HIDPI_IMAGES = YES;
373373
COPY_PHASE_STRIP = NO;
374-
FRAMEWORK_SEARCH_PATHS = "";
375374
GCC_DYNAMIC_NO_PIC = NO;
376375
GCC_MODEL_TUNING = G5;
377376
GCC_OPTIMIZATION_LEVEL = 0;
@@ -433,7 +432,6 @@
433432
isa = XCBuildConfiguration;
434433
baseConfigurationReference = C3C3CBBF19EA07F600A0296A /* CorePlotWarnings.xcconfig */;
435434
buildSettings = {
436-
FRAMEWORK_SEARCH_PATHS = "";
437435
GCC_C_LANGUAGE_STANDARD = c99;
438436
GCC_PREPROCESSOR_DEFINITIONS = "";
439437
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/DropPlot/DropPlot.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@
404404
CLANG_ENABLE_OBJC_ARC = YES;
405405
COMBINE_HIDPI_IMAGES = YES;
406406
COPY_PHASE_STRIP = NO;
407-
FRAMEWORK_SEARCH_PATHS = "";
408407
GCC_DYNAMIC_NO_PIC = NO;
409408
GCC_MODEL_TUNING = G5;
410409
GCC_OPTIMIZATION_LEVEL = 0;
@@ -426,7 +425,6 @@
426425
CLANG_ENABLE_OBJC_ARC = YES;
427426
COMBINE_HIDPI_IMAGES = YES;
428427
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
429-
FRAMEWORK_SEARCH_PATHS = "";
430428
GCC_MODEL_TUNING = G5;
431429
GCC_PRECOMPILE_PREFIX_HEADER = YES;
432430
GCC_PREFIX_HEADER = DropPlot_Prefix.pch;
@@ -462,7 +460,6 @@
462460
isa = XCBuildConfiguration;
463461
baseConfigurationReference = C3D6210E19DF72E000652CE7 /* CorePlotWarnings.xcconfig */;
464462
buildSettings = {
465-
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../framework/build/$(CONFIGURATION)\"/**";
466463
GCC_C_LANGUAGE_STANDARD = c99;
467464
GCC_WARN_ABOUT_RETURN_TYPE = YES;
468465
GCC_WARN_UNUSED_VARIABLE = YES;

‎examples/MinorTickLabels/minorTickFormatter.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@
371371
CLANG_ENABLE_OBJC_ARC = YES;
372372
COMBINE_HIDPI_IMAGES = YES;
373373
COPY_PHASE_STRIP = NO;
374-
FRAMEWORK_SEARCH_PATHS = "";
375374
GCC_DYNAMIC_NO_PIC = NO;
376375
GCC_MODEL_TUNING = G5;
377376
GCC_OPTIMIZATION_LEVEL = 0;
@@ -429,7 +428,6 @@
429428
isa = XCBuildConfiguration;
430429
baseConfigurationReference = C37FFB5D19E1ECF0003F34C5 /* CorePlotWarnings.xcconfig */;
431430
buildSettings = {
432-
FRAMEWORK_SEARCH_PATHS = "";
433431
GCC_C_LANGUAGE_STANDARD = c99;
434432
GCC_PREPROCESSOR_DEFINITIONS = "";
435433
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/RangePlot/RangePlot.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@
373373
CLANG_ENABLE_OBJC_ARC = YES;
374374
COMBINE_HIDPI_IMAGES = YES;
375375
COPY_PHASE_STRIP = NO;
376-
FRAMEWORK_SEARCH_PATHS = "";
377376
GCC_DYNAMIC_NO_PIC = NO;
378377
GCC_MODEL_TUNING = G5;
379378
GCC_OPTIMIZATION_LEVEL = 0;
@@ -431,7 +430,6 @@
431430
isa = XCBuildConfiguration;
432431
baseConfigurationReference = C37FFB6019E1EEB6003F34C5 /* CorePlotWarnings.xcconfig */;
433432
buildSettings = {
434-
FRAMEWORK_SEARCH_PATHS = "";
435433
GCC_C_LANGUAGE_STANDARD = c99;
436434
GCC_PREPROCESSOR_DEFINITIONS = "";
437435
GCC_WARN_ABOUT_RETURN_TYPE = YES;

0 commit comments

Comments
 (0)